Skip to content

Commit f0d57f4

Browse files
Bryan C. Millsbradfitz
Bryan C. Mills
authored andcommitted
all: set GO111MODULE=off explicitly in bind tests
Updates golang/go#27234 Updates golang/go#30228 Change-Id: Ibe281480398ff9d8c27657f399159885a75f646e Reviewed-on: https://go-review.googlesource.com/c/mobile/+/167179 Run-TryBot: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent d3739f8 commit f0d57f4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

bind/bind_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func genObjcPackages(t *testing.T, dir string, cg *ObjcWrapper) {
231231
"-pkgdir="+filepath.Join(dir, "pkg", build.Default.GOOS+"_"+build.Default.GOARCH),
232232
"ObjC/...",
233233
)
234-
cmd.Env = append(os.Environ(), "GOPATH="+dir)
234+
cmd.Env = append(os.Environ(), "GOPATH="+dir, "GO111MODULE=off")
235235
if out, err := cmd.CombinedOutput(); err != nil {
236236
t.Fatalf("failed to go install the generated ObjC wrappers: %v: %s", err, string(out))
237237
}
@@ -272,7 +272,7 @@ func genJavaPackages(t *testing.T, dir string, cg *ClassGen) {
272272
"-pkgdir="+filepath.Join(dir, "pkg", build.Default.GOOS+"_"+build.Default.GOARCH),
273273
"Java/...",
274274
)
275-
cmd.Env = append(os.Environ(), "GOPATH="+dir)
275+
cmd.Env = append(os.Environ(), "GOPATH="+dir, "GO111MODULE=off")
276276
if out, err := cmd.CombinedOutput(); err != nil {
277277
t.Fatalf("failed to go install the generated Java wrappers: %v: %s", err, string(out))
278278
}

cmd/gobind/gobind_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ func runGobind(t testing.TB, lang, pkg, goos string) error {
6262
cmd := exec.Command(gobindBin, "-lang", lang, pkg)
6363
if goos != "" {
6464
cmd.Env = append(os.Environ(), "GOOS="+goos)
65-
cmd.Env = append(os.Environ(), "CGO_ENABLED=1")
65+
cmd.Env = append(cmd.Env, "CGO_ENABLED=1")
66+
cmd.Env = append(cmd.Env, "GO111MODULE=off")
6667
}
6768
if out, err := cmd.CombinedOutput(); err != nil {
6869
return fmt.Errorf("gobind -lang %s %s failed: %v: %s", lang, pkg, err, out)

0 commit comments

Comments
 (0)