aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElias Naur <elias.naur@gmail.com>2016-03-24 10:16:46 +0100
committerElias Naur <elias.naur@gmail.com>2016-03-24 14:15:17 +0000
commit570a2b0eecc6ae8e398b2f1b56785cc9cacf0dbe (patch)
tree7c387500190b1c87c6823b7a4fbd541c9072669b /src
parent0bb62299b0a37b68fa3bb40a0fe449858e162809 (diff)
downloadgo-570a2b0eecc6ae8e398b2f1b56785cc9cacf0dbe.tar.xz
cmd/dist: skip testcarchive test in Android and iOS
CL 20892 converted the misc/cgo/testcarchive test to Go. Unfortunately, dist does not (yet) support tests running off the host so the testcarchive is disabled for now. For #14318 Change-Id: Iab3d0a7b5309187a603b48f22a7fa736f089f89d Reviewed-on: https://go-review.googlesource.com/21070 Reviewed-by: David Crawshaw <crawshaw@golang.org>
Diffstat (limited to 'src')
-rw-r--r--src/cmd/dist/test.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 0f28a71fc9..d8eb0f8a48 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -496,7 +496,9 @@ func (t *tester) registerTests() {
},
})
}
- if t.supportedBuildmode("c-archive") {
+ if t.supportedBuildmode("c-archive") && t.goos != "android" && !t.iOS() {
+ // TODO(elias.naur): reenable on android and iOS
+ // golang.org/issue/8345
t.registerTest("testcarchive", "../misc/cgo/testcarchive", "go", "test", "carchive_test.go")
}
if t.supportedBuildmode("c-shared") {