Commit 671472c1 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick

build: don't run a cgo test when cgo is disabled

Fixes the linux-amd64-nocgo builder.

Regression from https://golang.org/cl/6531

Change-Id: Ibffd1ecfee4a888605ed54196f53956ae42e591c
Reviewed-on: https://go-review.googlesource.com/6700Reviewed-by: 's avatarAndrew Gerrand <adg@golang.org>
parent 848e2fea
......@@ -287,12 +287,12 @@ func (t *tester) registerTests() {
} else if t.hasBash() {
t.registerTest("testso", "../misc/cgo/testso", "./test.bash")
}
}
if t.gohostos == "linux" && t.goarch == "amd64" {
t.registerTest("testasan", "../misc/cgo/testasan", "go", "run", "main.go")
}
if t.hasBash() && cgo && t.gohostos != "windows" {
t.registerTest("cgo_errors", "../misc/cgo/errors", "./test.bash")
if t.gohostos == "linux" && t.goarch == "amd64" {
t.registerTest("testasan", "../misc/cgo/testasan", "go", "run", "main.go")
}
if t.hasBash() && t.gohostos != "windows" {
t.registerTest("cgo_errors", "../misc/cgo/errors", "./test.bash")
}
}
if t.hasBash() && t.goos != "nacl" && t.goos != "android" {
t.registerTest("doc_progs", "../doc/progs", "time", "./run")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment