mirror of
https://github.com/golang/go
synced 2024-11-19 21:54:40 -07:00
cmd/dist: return dropped tests from misc/cgo/test
In a previous change to cmd/dist/test.go to fix some pie testcases, a few other tests were incorrectly dropped. This returns the testcases that shouldn't have been removed. Fixes #22708 Change-Id: I2f735f4fd3a378f0f45d12a99768638aeb4787c7 Reviewed-on: https://go-review.googlesource.com/77650 Run-TryBot: Russ Cox <rsc@golang.org> Run-TryBot: Ian Lance Taylor <iant@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
parent
b868616b63
commit
12e2933bbe
16
src/cmd/dist/test.go
vendored
16
src/cmd/dist/test.go
vendored
@ -949,6 +949,22 @@ func (t *tester) cgoTest(dt *distTest) error {
|
|||||||
// static linking on FreeBSD/ARM with clang. (cgo depends on
|
// static linking on FreeBSD/ARM with clang. (cgo depends on
|
||||||
// -fPIC fundamentally.)
|
// -fPIC fundamentally.)
|
||||||
default:
|
default:
|
||||||
|
cmd := t.dirCmd("misc/cgo/test",
|
||||||
|
compilerEnvLookup(defaultcc, goos, goarch), "-xc", "-o", "/dev/null", "-static", "-")
|
||||||
|
cmd.Stdin = strings.NewReader("int main() {}")
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
fmt.Println("No support for static linking found (lacks libc.a?), skip cgo static linking test.")
|
||||||
|
} else {
|
||||||
|
if goos != "android" {
|
||||||
|
t.addCmd(dt, "misc/cgo/testtls", "go", "test", "-ldflags", `-linkmode=external -extldflags "-static -pthread"`)
|
||||||
|
}
|
||||||
|
t.addCmd(dt, "misc/cgo/nocgo", "go", "test")
|
||||||
|
t.addCmd(dt, "misc/cgo/nocgo", "go", "test", "-ldflags", `-linkmode=external`)
|
||||||
|
if goos != "android" {
|
||||||
|
t.addCmd(dt, "misc/cgo/nocgo", "go", "test", "-ldflags", `-linkmode=external -extldflags "-static -pthread"`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if t.supportedBuildmode("pie") {
|
if t.supportedBuildmode("pie") {
|
||||||
t.addCmd(dt, "misc/cgo/test", "go", "test", "-buildmode=pie")
|
t.addCmd(dt, "misc/cgo/test", "go", "test", "-buildmode=pie")
|
||||||
t.addCmd(dt, "misc/cgo/testtls", "go", "test", "-buildmode=pie")
|
t.addCmd(dt, "misc/cgo/testtls", "go", "test", "-buildmode=pie")
|
||||||
|
Loading…
Reference in New Issue
Block a user