status-im/mobile
2
0
Fork 0
mirror of synced 2025-02-22 22:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: set GO111MODULE=off explicitly in bind tests

Browse Source 
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>
This commit is contained in:
Bryan C. Mills 2019-03-12 12:48:10 -04:00 committed by Brad Fitzpatrick
parent d3739f865f
commit f0d57f48df
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bind/bind_test.go
View File

@ -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))
}

3
cmd/gobind/gobind_test.go
View File

@ -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)