aboutsummaryrefslogtreecommitdiff
path: root/libgo/go/net/tcp_test.go
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2016-02-03 21:58:02 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-02-03 21:58:02 +0000
commitf98dd1a338867a408f7c72d73fbad7fe7fc93e3a (patch)
tree2f8da9862a9c1fe0df138917f997b03439c02773 /libgo/go/net/tcp_test.go
parentb081ed4efc144da0c45a6484aebfd10e0eb9fda3 (diff)
downloadgcc-f98dd1a338867a408f7c72d73fbad7fe7fc93e3a.zip
gcc-f98dd1a338867a408f7c72d73fbad7fe7fc93e3a.tar.gz
gcc-f98dd1a338867a408f7c72d73fbad7fe7fc93e3a.tar.bz2
libgo: Update to go1.6rc1.
Reviewed-on: https://go-review.googlesource.com/19200 From-SVN: r233110
Diffstat (limited to 'libgo/go/net/tcp_test.go')
-rw-r--r--libgo/go/net/tcp_test.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/libgo/go/net/tcp_test.go b/libgo/go/net/tcp_test.go
index 25ae9b9..9da6f6c 100644
--- a/libgo/go/net/tcp_test.go
+++ b/libgo/go/net/tcp_test.go
@@ -540,9 +540,12 @@ func TestTCPStress(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- defer ln.Close()
+ done := make(chan bool)
// Acceptor.
go func() {
+ defer func() {
+ done <- true
+ }()
for {
c, err := ln.Accept()
if err != nil {
@@ -560,7 +563,6 @@ func TestTCPStress(t *testing.T) {
}(c)
}
}()
- done := make(chan bool)
for i := 0; i < conns; i++ {
// Client connection.
go func() {
@@ -584,4 +586,6 @@ func TestTCPStress(t *testing.T) {
for i := 0; i < conns; i++ {
<-done
}
+ ln.Close()
+ <-done
}