aboutsummaryrefslogtreecommitdiff
path: root/libgo/go/expvar/expvar_test.go
diff options
context:
space:
mode:
authorGiuliano Belinassi <giuliano.belinassi@usp.br>2020-08-22 17:43:43 -0300
committerGiuliano Belinassi <giuliano.belinassi@usp.br>2020-08-22 17:43:43 -0300
commita926878ddbd5a98b272c22171ce58663fc04c3e0 (patch)
tree86af256e5d9a9c06263c00adc90e5fe348008c43 /libgo/go/expvar/expvar_test.go
parent542730f087133690b47e036dfd43eb0db8a650ce (diff)
parent07cbaed8ba7d1b6e4ab3a9f44175502a4e1ecdb1 (diff)
downloadgcc-devel/autopar_devel.zip
gcc-devel/autopar_devel.tar.gz
gcc-devel/autopar_devel.tar.bz2
Merge branch 'autopar_rebase2' into autopar_develdevel/autopar_devel
Quickly commit changes in the rebase branch.
Diffstat (limited to 'libgo/go/expvar/expvar_test.go')
-rw-r--r--libgo/go/expvar/expvar_test.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/libgo/go/expvar/expvar_test.go b/libgo/go/expvar/expvar_test.go
index 7b1f83a..69b0a76 100644
--- a/libgo/go/expvar/expvar_test.go
+++ b/libgo/go/expvar/expvar_test.go
@@ -489,12 +489,13 @@ func BenchmarkRealworldExpvarUsage(b *testing.B) {
b.Fatalf("Listen failed: %v", err)
}
defer ln.Close()
- done := make(chan bool)
+ done := make(chan bool, 1)
go func() {
for p := 0; p < P; p++ {
s, err := ln.Accept()
if err != nil {
b.Errorf("Accept failed: %v", err)
+ done <- false
return
}
servers[p] = s
@@ -504,11 +505,14 @@ func BenchmarkRealworldExpvarUsage(b *testing.B) {
for p := 0; p < P; p++ {
c, err := net.Dial("tcp", ln.Addr().String())
if err != nil {
+ <-done
b.Fatalf("Dial failed: %v", err)
}
clients[p] = c
}
- <-done
+ if !<-done {
+ b.FailNow()
+ }
b.StartTimer()