From 651a8d81baf03a87c244ad317d69cf2ee20fcccd Mon Sep 17 00:00:00 2001 From: Benny Siegert Date: Sat, 5 Feb 2022 17:23:26 +0100 Subject: [release-branch.go1.17] cmd/dist: skip internal linking tests on arm64 The previous workaround for issue #39466 only disabled this test for Linux. However, the issue manifests for all arm64 systems with gcc 9.4 and above. The new netbsd-arm64 builder uses NetBSD-current with gcc 10.3, so it fails in the same way. Updates #39466. For #53050. Change-Id: I276a99a5e60914e5c22f74a680e461bea17cfe92 Reviewed-on: https://go-review.googlesource.com/c/go/+/383554 Trust: Benny Siegert Run-TryBot: Ian Lance Taylor TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor (cherry picked from commit 1d6051380c1faa3e515db73c4cfe14f807e2c686) Reviewed-on: https://go-review.googlesource.com/c/go/+/415074 Run-TryBot: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov Reviewed-by: Cherry Mui --- src/cmd/dist/test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index beb7c4650c..a6ea64b495 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -1140,9 +1140,9 @@ func (t *tester) cgoTest(dt *distTest) error { cmd := t.addCmd(dt, "misc/cgo/test", t.goTest()) setEnv(cmd, "GOFLAGS", "-ldflags=-linkmode=auto") - // Skip internal linking cases on linux/arm64 to support GCC-9.4 and above. + // Skip internal linking cases on arm64 to support GCC-9.4 and above. // See issue #39466. - skipInternalLink := goarch == "arm64" && goos == "linux" + skipInternalLink := goarch == "arm64" && goos != "windows" if t.internalLink() && !skipInternalLink { cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=internal") -- cgit v1.2.3-54-g00ecf