From 0c38d789bcce1b0de41e3a97478d613aa4665c95 Mon Sep 17 00:00:00 2001 From: Wei Xiao Date: Tue, 6 Jun 2017 02:03:55 +0000 Subject: [PATCH] cmd/go: fix TestBuildIDContainsArchModeEnv fail on arm64 TestBuildIDContainsArchModeEnv fails on arm64 because defaultGO386 has different value from x86 (amd64/386). On arm64 defaultGO386 = '387' but on x86 defaultGO386 = 'sse2'. The difference will make the test succeed on x86 while fail on arm64 since it generates the same build ID. Fix it by explicitly setting GO386 instead of using default value Fixes #20608 Change-Id: I864b0e47325942d9513516bdf47f60391d18c0d0 Reviewed-on: https://go-review.googlesource.com/45112 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick --- src/cmd/go/go_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go index 788b8daa0e..9de9b121f1 100644 --- a/src/cmd/go/go_test.go +++ b/src/cmd/go/go_test.go @@ -4158,7 +4158,7 @@ func main() {}`) tg.setenv("GOARCH", "386") tg.setenv("GO386", "387") }, func() { - tg.setenv("GO386", "") + tg.setenv("GO386", "sse2") })) t.Run("arm", testWith(func() { -- 2.50.0