obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 57 insertions, 0 deletions

diff --git a/libgo/go/net/timeout_test.go b/libgo/go/net/timeout_test.go
new file mode 100644
index 000000000..09a257dc8
--- /dev/null
+++ b/libgo/go/net/timeout_test.go
@@ -0,0 +1,57 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package net
+
+import (
+	"os"
+	"testing"
+	"time"
+)
+
+func testTimeout(t *testing.T, network, addr string, readFrom bool) {
+	fd, err := Dial(network, "", addr)
+	if err != nil {
+		t.Errorf("dial %s %s failed: %v", network, addr, err)
+		return
+	}
+	defer fd.Close()
+	t0 := time.Nanoseconds()
+	fd.SetReadTimeout(1e8) // 100ms
+	var b [100]byte
+	var n int
+	var err1 os.Error
+	if readFrom {
+		n, _, err1 = fd.(PacketConn).ReadFrom(b[0:])
+	} else {
+		n, err1 = fd.Read(b[0:])
+	}
+	t1 := time.Nanoseconds()
+	what := "Read"
+	if readFrom {
+		what = "ReadFrom"
+	}
+	if n != 0 || err1 == nil || !err1.(Error).Timeout() {
+		t.Errorf("fd.%s on %s %s did not return 0, timeout: %v, %v", what, network, addr, n, err1)
+	}
+	if t1-t0 < 0.5e8 || t1-t0 > 1.5e8 {
+		t.Errorf("fd.%s on %s %s took %f seconds, expected 0.1", what, network, addr, float64(t1-t0)/1e9)
+	}
+}
+
+func TestTimeoutUDP(t *testing.T) {
+	testTimeout(t, "udp", "127.0.0.1:53", false)
+	testTimeout(t, "udp", "127.0.0.1:53", true)
+}
+
+func TestTimeoutTCP(t *testing.T) {
+	// set up a listener that won't talk back
+	listening := make(chan string)
+	done := make(chan int)
+	go runServe(t, "tcp", "127.0.0.1:0", listening, done)
+	addr := <-listening
+
+	testTimeout(t, "tcp", addr, false)
+	<-done
+}