qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 10:10:02 -07:00
Code Releases Activity

cmd/go: "go test -c -test.bench=XX fmt" shouldn't hang

Browse Source 
Fixes #6480.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/13925043
This commit is contained in:
Shenghou Ma 2013-09-25 16:18:33 -04:00
parent bc0e51555c
commit 752960aa5c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmd/go/test.bash
View File

@ -408,7 +408,7 @@ if ! grep -q '^hello world' hello.out; then
cat hello.out cat hello.out
ok=false ok=false
fi fi
rm -rf $d rm -rf $d hello.out
TEST go test -cpuprofile leaves binary behind TEST go test -cpuprofile leaves binary behind
./testgo test -cpuprofile strings.prof strings || ok=false ./testgo test -cpuprofile strings.prof strings || ok=false
@ -613,6 +613,13 @@ fi
rm -rf $d rm -rf $d
unset GOPATH unset GOPATH
TEST 'Issue 6480: "go test -c -test.bench=XXX fmt" should not hang'
if ! ./testgo test -c -test.bench=XXX fmt; then
echo build test failed
ok=false
fi
rm -f fmt.test
# clean up # clean up
if $started; then stop; fi if $started; then stop; fi
rm -rf testdata/bin testdata/bin1 rm -rf testdata/bin testdata/bin1

2
src/cmd/go/test.go
View File

@ -449,7 +449,7 @@ func runTest(cmd *Command, args []string) {
} }
// Force benchmarks to run in serial. // Force benchmarks to run in serial.
if testBench { if !testC && testBench {
// The first run must wait for all builds. // The first run must wait for all builds.
// Later runs must wait for the previous run's print. // Later runs must wait for the previous run's print.
for i, run := range runs { for i, run := range runs {