From 4f0561f9d354233787de7aa9eff8119a2d4cd5c6 Mon Sep 17 00:00:00 2001 From: Cherry Mui Date: Wed, 18 Dec 2024 11:28:18 -0500 Subject: [PATCH] cmd/dist: skip fips140test in exe mode on Android Android does not support non-PIE linking. Skip the test. Change-Id: I53071538c82f1e1f96eed1a2619f92eacd18d263 Reviewed-on: https://go-review.googlesource.com/c/go/+/637495 Run-TryBot: Cherry Mui LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov TryBot-Result: Gopher Robot --- src/cmd/dist/test.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 5a981f8bc1..06bd01bc5b 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -876,16 +876,18 @@ func (t *tester) registerTests() { } if t.extLink() && !t.compileOnly { - t.registerTest("external linking, -buildmode=exe", - &goTest{ - variant: "exe_external", - timeout: 60 * time.Second, - buildmode: "exe", - ldflags: "-linkmode=external", - env: []string{"CGO_ENABLED=1"}, - pkg: "crypto/internal/fips140test", - runTests: "TestFIPSCheck", - }) + if goos != "android" { // Android does not support non-PIE linking + t.registerTest("external linking, -buildmode=exe", + &goTest{ + variant: "exe_external", + timeout: 60 * time.Second, + buildmode: "exe", + ldflags: "-linkmode=external", + env: []string{"CGO_ENABLED=1"}, + pkg: "crypto/internal/fips140test", + runTests: "TestFIPSCheck", + }) + } if t.externalLinkPIE() && !disablePIE { t.registerTest("external linking, -buildmode=pie", &goTest{ -- 2.48.1