From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Tue, 26 Jan 2021 16:29:05 +0000 (+0000)
Subject: cmd/link: disable TestPIESize if CGO isn't enabled
X-Git-Tag: go1.16~1^2~34
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=26e29aa15a189b26d3b2400a594d329368e78e79;p=gostls13.git

cmd/link: disable TestPIESize if CGO isn't enabled

With CGO disabled, the test throws the following error:

elf_test.go:291: # command-line-arguments
    loadinternal: cannot find runtime/cgo

Change-Id: Iaeb183562ab637c714240b49e73078bdb791b35b
GitHub-Last-Rev: f8fe9afad5611411966413d17cb5874f7b0018a0
GitHub-Pull-Request: golang/go#43911
Reviewed-on: https://go-review.googlesource.com/c/go/+/286632
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Trust: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/cmd/link/elf_test.go b/src/cmd/link/elf_test.go
index 334f050e88..20754d09f5 100644
--- a/src/cmd/link/elf_test.go
+++ b/src/cmd/link/elf_test.go
@@ -226,6 +226,12 @@ func main() {
 
 func TestPIESize(t *testing.T) {
 	testenv.MustHaveGoBuild(t)
+
+	// We don't want to test -linkmode=external if cgo is not supported.
+	// On some systems -buildmode=pie implies -linkmode=external, so just
+	// always skip the test if cgo is not supported.
+	testenv.MustHaveCGO(t)
+
 	if !sys.BuildModeSupported(runtime.Compiler, "pie", runtime.GOOS, runtime.GOARCH) {
 		t.Skip("-buildmode=pie not supported")
 	}