aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElias Naur <elias.naur@gmail.com>2017-01-30 19:55:35 +0100
committerElias Naur <elias.naur@gmail.com>2017-01-30 20:38:03 +0000
commit3e55059f305bde37a4dac1397e8a1b798b6fbd9e (patch)
treed443017cf5ceccfb34b8aeada72f6a0f8874a19f
parent09496599520d73171550987b138d85ae1fb13b76 (diff)
downloadgo-3e55059f305bde37a4dac1397e8a1b798b6fbd9e.tar.gz
go-3e55059f305bde37a4dac1397e8a1b798b6fbd9e.zip
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 <iant@golang.org> Run-TryBot: Elias Naur <elias.naur@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org>
-rw-r--r--src/cmd/dist/test.go2
1 files changed, 1 insertions, 1 deletions
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" {