aboutsummaryrefslogtreecommitdiff
path: root/libgo/go/expvar/expvar_test.go
diff options
context:
space:
mode:
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()