qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 15:54:46 -07:00
Code Releases Activity

cmd/dist: rearrange a couple of tests

Browse Source 
Run "cmd/go terminal test" after standard library tests.
Run "testing race detector" before cgo tests, not in the middle of them.

Fixes #21524

Change-Id: I32964ec6377dd070242138ec452bd8ab1821dcc5
Reviewed-on: https://go-review.googlesource.com/57230
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Joe Tsai <joetsai@google.com>
This commit is contained in:
Ian Lance Taylor 2017-08-18 17:43:33 -07:00
parent 75fbc8a3d0
commit 645ecf5d48
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/cmd/dist/test.go vendored
View File

@ -353,27 +353,6 @@ func (t *tester) registerTests() {
return return
} }
// This test needs its stdout/stderr to be terminals, so we don't run it from cmd/go's tests.
// See issue 18153.
if t.goos == "linux" {
t.tests = append(t.tests, distTest{
name: "cmd_go_test_terminal",
heading: "cmd/go terminal test",
fn: func(dt *distTest) error {
t.runPending(dt)
if !stdOutErrAreTerminals() {
fmt.Println("skipping terminal test; stdout/stderr not terminals")
return nil
}
cmd := exec.Command("go", "test")
cmd.Dir = filepath.Join(os.Getenv("GOROOT"), "src/cmd/go/testdata/testterminal18153")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
return cmd.Run()
},
})
}
// Fast path to avoid the ~1 second of `go list std cmd` when // Fast path to avoid the ~1 second of `go list std cmd` when
// the caller lists specific tests to run. (as the continuous // the caller lists specific tests to run. (as the continuous
// build coordinator does). // build coordinator does).
@ -434,6 +413,27 @@ func (t *tester) registerTests() {
}) })
} }
// This test needs its stdout/stderr to be terminals, so we don't run it from cmd/go's tests.
// See issue 18153.
if t.goos == "linux" {
t.tests = append(t.tests, distTest{
name: "cmd_go_test_terminal",
heading: "cmd/go terminal test",
fn: func(dt *distTest) error {
t.runPending(dt)
if !stdOutErrAreTerminals() {
fmt.Println("skipping terminal test; stdout/stderr not terminals")
return nil
}
cmd := exec.Command("go", "test")
cmd.Dir = filepath.Join(os.Getenv("GOROOT"), "src/cmd/go/testdata/testterminal18153")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
return cmd.Run()
},
})
}
// On the builders only, test that a moved GOROOT still works. // On the builders only, test that a moved GOROOT still works.
// Fails on iOS because CC_FOR_TARGET refers to clangwrap.sh // Fails on iOS because CC_FOR_TARGET refers to clangwrap.sh
// in the unmoved GOROOT. // in the unmoved GOROOT.
@ -535,6 +535,14 @@ func (t *tester) registerTests() {
}, },
}) })
if t.raceDetectorSupported() {
t.tests = append(t.tests, distTest{
name: "race",
heading: "Testing race detector",
fn: t.raceTest,
})
}
if t.cgoEnabled && !t.iOS() { if t.cgoEnabled && !t.iOS() {
// Disabled on iOS. golang.org/issue/15919 // Disabled on iOS. golang.org/issue/15919
t.tests = append(t.tests, distTest{ t.tests = append(t.tests, distTest{
@ -576,14 +584,6 @@ func (t *tester) registerTests() {
}) })
} }
if t.raceDetectorSupported() {
t.tests = append(t.tests, distTest{
name: "race",
heading: "Testing race detector",
fn: t.raceTest,
})
}
if t.hasBash() && t.cgoEnabled && t.goos != "android" && t.goos != "darwin" { if t.hasBash() && t.cgoEnabled && t.goos != "android" && t.goos != "darwin" {
t.registerTest("testgodefs", "../misc/cgo/testgodefs", "./test.bash") t.registerTest("testgodefs", "../misc/cgo/testgodefs", "./test.bash")
} }