Skip to content

Commit ce4d043

Browse files
committed
Windows and sdk_version_test
1 parent 05275a7 commit ce4d043

File tree

2 files changed

+38
-44
lines changed

2 files changed

+38
-44
lines changed

go/tools/bazel_testing/bazel_testing.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,13 +403,13 @@ func setupWorkspace(args Args, files []string) (dir string, cleanup func() error
403403
}
404404
info := workspaceTemplateInfo{
405405
TestedModuleRepoName: testedModuleRepoName,
406-
TestedModulePath: testedRepoDir,
406+
TestedModulePath: strings.ReplaceAll(testedRepoDir, "\\", "\\\\"),
407407
Prefix: args.WorkspacePrefix,
408408
Suffix: args.WorkspaceSuffix,
409409
Nogo: args.Nogo,
410410
NogoIncludes: args.NogoIncludes,
411411
NogoExcludes: args.NogoExcludes,
412-
GoSDKPath: filepath.Dir(goRootFileRealPath),
412+
GoSDKPath: strings.ReplaceAll(filepath.Dir(goRootFileRealPath), "\\", "\\\\"),
413413
}
414414
if err := defaultWorkspaceTpl.Execute(w, info); err != nil {
415415
return "", cleanup, err
@@ -435,7 +435,7 @@ func setupWorkspace(args Args, files []string) (dir string, cleanup func() error
435435
info := moduleFileTemplateInfo{
436436
TestedModuleName: testedModuleName,
437437
TestedModuleRepoName: testedModuleRepoName,
438-
TestedModulePath: testedRepoDir,
438+
TestedModulePath: strings.ReplaceAll(testedRepoDir, "\\", "\\\\"),
439439
Suffix: args.ModuleFileSuffix,
440440
}
441441
if err := defaultModuleBazelTpl.Execute(w, info); err != nil {

tests/core/cross/sdk_version_test.go

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -54,42 +54,14 @@ var testCases = []testcase{
5454
expectedVersion: "go1.17.1",
5555
},
5656
{
57-
Name: "1_17_release_candidate",
58-
SDKVersion: "1.17rc1",
59-
expectedVersion: "go1.17rc1",
57+
Name: "1_17_release_candidate",
58+
SDKVersion: "1.17rc1",
59+
expectedVersion: "go1.17rc1",
6060
},
6161
}
6262

6363
func TestMain(m *testing.M) {
6464
mainFilesTmpl := template.Must(template.New("").Parse(`
65-
-- WORKSPACE --
66-
local_repository(
67-
name = "io_bazel_rules_go",
68-
path = "../io_bazel_rules_go",
69-
)
70-
71-
load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_rules_dependencies", "go_register_toolchains")
72-
73-
go_rules_dependencies()
74-
75-
go_download_sdk(
76-
name = "go_sdk",
77-
version = "1.16",
78-
)
79-
go_download_sdk(
80-
name = "go_sdk_1_17",
81-
version = "1.17",
82-
)
83-
go_download_sdk(
84-
name = "go_sdk_1_17_1",
85-
version = "1.17.1",
86-
)
87-
go_download_sdk(
88-
name = "go_sdk_1_17_rc1",
89-
version = "1.17rc1",
90-
)
91-
92-
go_register_toolchains()
9365
-- main.go --
9466
package main
9567
@@ -116,17 +88,39 @@ go_cross_binary(
11688
)
11789
{{end}}
11890
`))
119-
tmplValues := struct{
120-
TestCases []testcase
121-
}{
122-
TestCases: testCases,
123-
}
124-
mainFilesBuilder := &strings.Builder{}
125-
if err := mainFilesTmpl.Execute(mainFilesBuilder, tmplValues); err != nil {
126-
panic(err)
127-
}
91+
tmplValues := struct {
92+
TestCases []testcase
93+
}{
94+
TestCases: testCases,
95+
}
96+
mainFilesBuilder := &strings.Builder{}
97+
if err := mainFilesTmpl.Execute(mainFilesBuilder, tmplValues); err != nil {
98+
panic(err)
99+
}
128100

129-
bazel_testing.TestMain(m, bazel_testing.Args{Main: mainFilesBuilder.String()})
101+
bazel_testing.TestMain(m, bazel_testing.Args{
102+
Main: mainFilesBuilder.String(),
103+
WorkspacePrefix: `
104+
load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk")
105+
106+
go_download_sdk(
107+
name = "go_sdk",
108+
version = "1.16",
109+
)
110+
go_download_sdk(
111+
name = "go_sdk_1_17",
112+
version = "1.17",
113+
)
114+
go_download_sdk(
115+
name = "go_sdk_1_17_1",
116+
version = "1.17.1",
117+
)
118+
go_download_sdk(
119+
name = "go_sdk_1_17_rc1",
120+
version = "1.17rc1",
121+
)
122+
`,
123+
})
130124
}
131125

132126
func Test(t *testing.T) {

0 commit comments

Comments
 (0)