aboutsummaryrefslogtreecommitdiff
path: root/libgo/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2013-12-27 21:42:26 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2013-12-27 21:42:26 +0000
commitafc8adc88f9cae98c5207cbad20c32c28e74bf3c (patch)
treebb4889ca199becb32f662feed26f5fa02c506219 /libgo/go
parent4de67111df21f434ea650ecb83306807ee7f3068 (diff)
downloadgcc-afc8adc88f9cae98c5207cbad20c32c28e74bf3c.zip
gcc-afc8adc88f9cae98c5207cbad20c32c28e74bf3c.tar.gz
gcc-afc8adc88f9cae98c5207cbad20c32c28e74bf3c.tar.bz2
re PR go/59506 (net FAILs (timeout) on alpha)
PR go/59506 net: use DialTimeout in TestSelfConnect Backported from master repository. This avoids problems with systems that take a long time to find out nothing is listening, while still testing for the self-connect misfeature since a self-connect should be fast. With this we may be able to remove the test for non-Linux systems. Tested (on GNU/Linux) by editing selfConnect in tcpsock_posix.go to always return false and verifying that TestSelfConnect then fails with and without this change. Idea from Uros Bizjak. From-SVN: r206224
Diffstat (limited to 'libgo/go')
-rw-r--r--libgo/go/net/dial_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/go/net/dial_test.go b/libgo/go/net/dial_test.go
index c7ffdd3..973e69d 100644
--- a/libgo/go/net/dial_test.go
+++ b/libgo/go/net/dial_test.go
@@ -147,7 +147,7 @@ func TestSelfConnect(t *testing.T) {
n = 100
}
for i := 0; i < n; i++ {
- c, err := Dial("tcp", addr)
+ c, err := DialTimeout("tcp", addr, time.Millisecond)
if err == nil {
c.Close()
t.Errorf("#%d: Dial %q succeeded", i, addr)