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 <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
golang · Mar 13, 2019 · f0d57f4 · f0d57f4
1 parent d3739f8
commit f0d57f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bind/bind_test.go b/bind/bind_test.go
@@ -231,7 +231,7 @@ func genObjcPackages(t *testing.T, dir string, cg *ObjcWrapper) {
 		"-pkgdir="+filepath.Join(dir, "pkg", build.Default.GOOS+"_"+build.Default.GOARCH),
 		"ObjC/...",
 	)
-	cmd.Env = append(os.Environ(), "GOPATH="+dir)
+	cmd.Env = append(os.Environ(), "GOPATH="+dir, "GO111MODULE=off")
 	if out, err := cmd.CombinedOutput(); err != nil {
 		t.Fatalf("failed to go install the generated ObjC wrappers: %v: %s", err, string(out))
 	}
@@ -272,7 +272,7 @@ func genJavaPackages(t *testing.T, dir string, cg *ClassGen) {
 		"-pkgdir="+filepath.Join(dir, "pkg", build.Default.GOOS+"_"+build.Default.GOARCH),
 		"Java/...",
 	)
-	cmd.Env = append(os.Environ(), "GOPATH="+dir)
+	cmd.Env = append(os.Environ(), "GOPATH="+dir, "GO111MODULE=off")
 	if out, err := cmd.CombinedOutput(); err != nil {
 		t.Fatalf("failed to go install the generated Java wrappers: %v: %s", err, string(out))
 	}

diff --git a/cmd/gobind/gobind_test.go b/cmd/gobind/gobind_test.go
@@ -62,7 +62,8 @@ func runGobind(t testing.TB, lang, pkg, goos string) error {
 	cmd := exec.Command(gobindBin, "-lang", lang, pkg)
 	if goos != "" {
 		cmd.Env = append(os.Environ(), "GOOS="+goos)
-		cmd.Env = append(os.Environ(), "CGO_ENABLED=1")
+		cmd.Env = append(cmd.Env, "CGO_ENABLED=1")
+		cmd.Env = append(cmd.Env, "GO111MODULE=off")
 	}
 	if out, err := cmd.CombinedOutput(); err != nil {
 		return fmt.Errorf("gobind -lang %s %s failed: %v: %s", lang, pkg, err, out)