]> Cypherpunks repositories - gostls13.git/commitdiff
all: do not test internal linking on windows/arm64
authorRuss Cox <rsc@golang.org>
Tue, 20 Apr 2021 19:43:17 +0000 (15:43 -0400)
committerRuss Cox <rsc@golang.org>
Fri, 23 Apr 2021 21:48:37 +0000 (21:48 +0000)
(It doesn't work and isn't used by default.)

Change-Id: I90118d889bd963471f0915d8183502b55bd9dbf2
Reviewed-on: https://go-review.googlesource.com/c/go/+/312045
Trust: Russ Cox <rsc@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
src/cmd/link/link_test.go
src/cmd/nm/nm_cgo_test.go
src/debug/pe/file_cgo_test.go

index 985aed49e2bb2c07e5bd621896e67859f3762191..285c650282826bd80dc979711efcc65aea355c7f 100644 (file)
@@ -177,7 +177,8 @@ func TestIssue33979(t *testing.T) {
        case "mips", "mipsle", "mips64", "mips64le":
                t.Skipf("Skipping on %s/%s", runtime.GOOS, runtime.GOARCH)
        }
-       if runtime.GOOS == "aix" {
+       if runtime.GOOS == "aix" ||
+               runtime.GOOS == "windows" && runtime.GOARCH == "arm64" {
                t.Skipf("Skipping on %s/%s", runtime.GOOS, runtime.GOARCH)
        }
 
index 536e87e4ae0403897d3ca2a95e65b9a0d5cdf3cb..d0937904a2a81a69a3df4f2c324a448d6ceca5a8 100644 (file)
@@ -33,6 +33,11 @@ func canInternalLink() bool {
                case "arm64":
                        return false
                }
+       case "windows":
+               switch runtime.GOARCH {
+               case "arm64":
+                       return false
+               }
        }
        return true
 }
index bba3a068d64d0dcc1300a80efcf30e38e50c87a0..13eb4e62b2ed7687eacd4d0c25be3766b028be80 100644 (file)
@@ -9,6 +9,7 @@ package pe
 
 import (
        "os/exec"
+       "runtime"
        "testing"
 )
 
@@ -24,6 +25,9 @@ func TestDefaultLinkerDWARF(t *testing.T) {
 }
 
 func TestInternalLinkerDWARF(t *testing.T) {
+       if runtime.GOARCH == "arm64" {
+               t.Skip("internal linker disabled on windows/arm64")
+       }
        testCgoDWARF(t, linkCgoInternal)
 }