From 3e55059f305bde37a4dac1397e8a1b798b6fbd9e Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 30 Jan 2017 19:55:35 +0100 Subject: [PATCH] cmd/dist: really skip the testsanitizers tests on Android The test.bash script in misc/cgo/testsanitizers use GOOS, not GOHOSTOS. Fix the dist check from gohostos to goos accordingly. The error was masked on the builders because they run on a darwin host where the sanitizers tests never ran. With this change, the Android test suite completes successfully on Android/amd64. Change-Id: Id7690429f78c6ac7a26fc9118d913b719b565bb2 Reviewed-on: https://go-review.googlesource.com/35959 Reviewed-by: Ian Lance Taylor Run-TryBot: Elias Naur TryBot-Result: Gobot Gobot --- src/cmd/dist/test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 8ad4a8620d..c51dcead2b 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -567,7 +567,7 @@ func (t *tester) registerTests() { if t.gohostos == "linux" && t.goarch == "amd64" { t.registerTest("testasan", "../misc/cgo/testasan", "go", "run", "main.go") } - if t.gohostos == "linux" && t.goarch == "amd64" { + if t.goos == "linux" && t.goarch == "amd64" { t.registerTest("testsanitizers", "../misc/cgo/testsanitizers", "./test.bash") } if t.hasBash() && t.goos != "android" && !t.iOS() && t.gohostos != "windows" { -- 2.50.0