From: Russ Cox Date: Thu, 17 Dec 2015 03:40:15 +0000 (-0500) Subject: cmd/go: disable use of -linkmode=external in tests when CGO_ENABLED=0 X-Git-Tag: go1.6beta1~38 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=37f2afa625204befc21837756d5e64fe0ffcd7d5;p=gostls13.git cmd/go: disable use of -linkmode=external in tests when CGO_ENABLED=0 If cgo is turned off, there may not be an external linker available. Fixes #13450. Change-Id: Idbf3f3f57b4bb3908b67264f96d276acc952102a Reviewed-on: https://go-review.googlesource.com/17941 Reviewed-by: Ian Lance Taylor --- diff --git a/src/cmd/go/note_test.go b/src/cmd/go/note_test.go index bfaa75f6c3..811734b377 100644 --- a/src/cmd/go/note_test.go +++ b/src/cmd/go/note_test.go @@ -6,6 +6,7 @@ package main_test import ( main "cmd/go" + "go/build" "runtime" "testing" ) @@ -42,6 +43,8 @@ func testNoteReading(t *testing.T) { } switch { + case !build.Default.CgoEnabled: + t.Skipf("skipping - no cgo, so assuming external linking not available") case runtime.GOOS == "linux" && (runtime.GOARCH == "ppc64le" || runtime.GOARCH == "ppc64"): t.Skipf("skipping - external linking not supported, golang.org/issue/11184") case runtime.GOOS == "linux" && (runtime.GOARCH == "mips64le" || runtime.GOARCH == "mips64"):