diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-10-02 15:07:14 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-10-02 15:07:14 +0000 |
| commit | 4913fc07e0b3f1d574dc20f83ec819a26ab4346e (patch) | |
| tree | a71fa364340b23c6320039a6aa0951d3decfb01f | |
| parent | 0036218b1093a36a67d7c04834e5c0383eda6efa (diff) | |
| download | gcc-4913fc07e0b3f1d574dc20f83ec819a26ab4346e.zip gcc-4913fc07e0b3f1d574dc20f83ec819a26ab4346e.tar.gz gcc-4913fc07e0b3f1d574dc20f83ec819a26ab4346e.tar.bz2 | |
net: don't fail test if splice fails because pipe2 is missing
This reportedly happens on CentOS 5.11. The real code will work fine;
this test is assuming that the unexported slice function will handle
the splice, but if pipe2 does not work then it doesn't. The relevant
code in internal/poll/splice_linux.go says "Falling back to pipe is
possible, but prior to 2.6.29 splice returns -EAGAIN instead of 0 when
the connection is closed."
Reviewed-on: https://go-review.googlesource.com/138838
From-SVN: r264793
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/net/splice_test.go | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index ad3253f..b952872 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -53d0d7ca278a5612fcdb5fb098e7bf950a0178ef +098e36f4ddfcf50aeb34509b5f25b86d7050749c The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/net/splice_test.go b/libgo/go/net/splice_test.go index 44a5c00..40ed19b 100644 --- a/libgo/go/net/splice_test.go +++ b/libgo/go/net/splice_test.go @@ -11,7 +11,9 @@ import ( "fmt" "io" "io/ioutil" + "os" "sync" + "syscall" "testing" ) @@ -225,6 +227,10 @@ func testSpliceReaderAtEOF(t *testing.T) { serverUp.Close() _, err, handled := splice(serverDown.(*TCPConn).fd, serverUp) if !handled { + if serr, ok := err.(*os.SyscallError); ok && serr.Syscall == "pipe2" && serr.Err == syscall.ENOSYS { + t.Skip("pipe2 not supported") + } + t.Errorf("closed connection: got err = %v, handled = %t, want handled = true", err, handled) } lr := &io.LimitedReader{ |