From 515040548c1ca97fb4c2208d3c602aa65d1ed941 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Wed, 10 Aug 2022 22:13:23 +0700 Subject: [PATCH] cmd/compile/internal/amd64: more robust detection of GOAMD64=v1 Using build tool tags instead of relying on GOAMD64 env, which can be overriden at make.bash time. Change-Id: I96bb4b7416ea0bd1ab552feec9ede45b89a584c4 Reviewed-on: https://go-review.googlesource.com/c/go/+/422614 Reviewed-by: Than McIntosh Run-TryBot: Cuong Manh Le TryBot-Result: Gopher Robot Reviewed-by: Matthew Dempsky --- src/cmd/compile/internal/amd64/versions_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cmd/compile/internal/amd64/versions_test.go b/src/cmd/compile/internal/amd64/versions_test.go index b6411a1cb0d..647bcdc2f07 100644 --- a/src/cmd/compile/internal/amd64/versions_test.go +++ b/src/cmd/compile/internal/amd64/versions_test.go @@ -14,6 +14,7 @@ import ( "debug/macho" "errors" "fmt" + "go/build" "internal/testenv" "io" "math" @@ -36,10 +37,10 @@ func TestGoAMD64v1(t *testing.T) { if runtime.GOOS != "linux" && runtime.GOOS != "darwin" { t.Skip("test only works on elf or macho platforms") } - if v := os.Getenv("GOAMD64"); v != "" && v != "v1" { - // Test runs only on v1 (which is the default). - // TODO: use build tags from #45454 instead. - t.Skip("GOAMD64 already set") + for _, tag := range build.Default.ToolTags { + if tag == "amd64.v2" { + t.Skip("compiling for GOAMD64=v2 or higher") + } } if os.Getenv("TESTGOAMD64V1") != "" { t.Skip("recursive call")