commit f0d57f48df14cfba6a94b844395bd6def5a28443
author Bryan C. Mills <bcmills@google.com> Tue Mar 12 12:48:10 2019 -0400
committer Brad Fitzpatrick <bradfitz@golang.org> Wed Mar 13 03:07:56 2019 +0000
tree bd418969fc38ae871e36f1be60ded609b517fe5e
parent d3739f865fa66d07c1f506505c18aac71a8ead6e

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>

bind/bind_test.go

diff --git a/bind/bind_test.go b/bind/bind_test.go
index 6732ff3..73a34c9 100644
--- a/bind/bind_test.go
+++ b/bind/bind_test.go
@@ -231,7 +231,7 @@
 		"-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 @@
 		"-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))
 	}

cmd/gobind/gobind_test.go

diff --git a/cmd/gobind/gobind_test.go b/cmd/gobind/gobind_test.go
index 7924f06..6ff40f7 100644
--- a/cmd/gobind/gobind_test.go
+++ b/cmd/gobind/gobind_test.go
@@ -62,7 +62,8 @@
 	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)