diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-06 17:57:23 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-06 17:57:23 +0000 |
| commit | 220a902afa4e096172926d498e1efac23e80deb7 (patch) | |
| tree | 4ce83ca433796a728e9fdd00af105bce158532b5 /libgo/go/net/timeout_test.go | |
| parent | 506056fd6ecd06499e2ee7f6e37dbd5fbf7f4de6 (diff) | |
| download | gcc-220a902afa4e096172926d498e1efac23e80deb7.tar.gz | |
libgo: Update to weekly.2012-03-04 release.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185010 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/net/timeout_test.go')
| -rw-r--r-- | libgo/go/net/timeout_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/go/net/timeout_test.go b/libgo/go/net/timeout_test.go index bae37c86b2e..ef350f0f946 100644 --- a/libgo/go/net/timeout_test.go +++ b/libgo/go/net/timeout_test.go @@ -40,7 +40,7 @@ func testTimeout(t *testing.T, network, addr string, readFrom bool) { errc <- fmt.Errorf("fd.%s on %s %s did not return 0, timeout: %v, %v", what, network, addr, n, err1) return } - if dt := t1.Sub(t0); dt < 50*time.Millisecond || dt > 250*time.Millisecond { + if dt := t1.Sub(t0); dt < 50*time.Millisecond || !testing.Short() && dt > 250*time.Millisecond { errc <- fmt.Errorf("fd.%s on %s %s took %s, expected 0.1s", what, network, addr, dt) return } |