[release-branch.go1.13] cmd/go: convert TestBuildIDContainsArchModeEnv to the script...

Part of converting all tests to script framework to improve
test parallelism.

Fixes #39823
Updates #36320
Updates #17751

Change-Id: I69c69809fb1698c8198ef3ea00103a9acb7b6ce7
Reviewed-on: https://go-review.googlesource.com/c/go/+/214387
Run-TryBot: Michael Matloob <matloob@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
(cherry picked from CL 214387)
Reviewed-on: https://go-review.googlesource.com/c/go/+/239777
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Carlos Amedee <carlos@golang.org>

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index f6caa01fd22f93610c75dd54dea3ad08ff359ce2..6fbaf4df592484f7895370bcd1dfa2d303192466 100644 (file)
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -4878,45 +4878,6 @@ func TestGoTestRaceCoverModeFailures(t *testing.T) {
        tg.grepBothNot("PASS", "something passed")
 }
 
-// Issue 9737: verify that GOARM and GO386 affect the computed build ID.
-func TestBuildIDContainsArchModeEnv(t *testing.T) {
-       if testing.Short() {
-               t.Skip("skipping in short mode")
-       }
-
-       var tg *testgoData
-       testWith := func(before, after func()) func(*testing.T) {
-               return func(t *testing.T) {
-                       tg = testgo(t)
-                       defer tg.cleanup()
-                       tg.tempFile("src/mycmd/x.go", `package main
-func main() {}`)
-                       tg.setenv("GOPATH", tg.path("."))
-
-                       tg.cd(tg.path("src/mycmd"))
-                       tg.setenv("GOOS", "linux")
-                       before()
-                       tg.run("install", "mycmd")
-                       after()
-                       tg.wantStale("mycmd", "stale dependency", "should be stale after environment variable change")
-               }
-       }
-
-       t.Run("386", testWith(func() {
-               tg.setenv("GOARCH", "386")
-               tg.setenv("GO386", "387")
-       }, func() {
-               tg.setenv("GO386", "sse2")
-       }))
-
-       t.Run("arm", testWith(func() {
-               tg.setenv("GOARCH", "arm")
-               tg.setenv("GOARM", "5")
-       }, func() {
-               tg.setenv("GOARM", "7")
-       }))
-}
-
 func TestTestRegexps(t *testing.T) {
        tg := testgo(t)
        defer tg.cleanup()

diff --git a/src/cmd/go/testdata/script/build_cache_arch_mode.txt b/src/cmd/go/testdata/script/build_cache_arch_mode.txt
new file mode 100644 (file)
index 0000000..7e751d0
--- /dev/null
+++ b/src/cmd/go/testdata/script/build_cache_arch_mode.txt
@@ -0,0 +1,27 @@
+# Issue 9737: verify that GOARM and GO386 affect the computed build ID
+
+[short] skip
+
+# 386
+cd $GOPATH/src/mycmd
+env GOOS=linux
+env GOARCH=386
+env GO386=387
+go install mycmd
+env GO386=sse2
+stale mycmd
+
+# arm
+cd $GOPATH/src/mycmd
+env GOOS=linux
+env GOARCH=arm
+env GOARM=5
+go install mycmd
+env GOARM=7
+stale mycmd
+
+
+-- mycmd/x.go --
+package main
+
+func main() {}
\ No newline at end of file