From: Michael Munday <munday@ca.ibm.com>
Date: Tue, 12 Apr 2016 16:46:54 +0000 (-0400)
Subject: net/http: fix TestLinuxSendfile on s390x
X-Git-Tag: go1.7beta1~742
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b09c274bfabb3edef60b4df3375906852aab7da1;p=gostls13.git

net/http: fix TestLinuxSendfile on s390x

s390x doesn't have sendfile64 so apply the same fix as MIPS
(eebf7d27) and just use sendfile.

Change-Id: If8fe2e974ed44a9883282430157c3545d5bd04bd
Reviewed-on: https://go-review.googlesource.com/21892
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/http/fs_test.go b/src/net/http/fs_test.go
index 9253ebe43a..c811891e87 100644
--- a/src/net/http/fs_test.go
+++ b/src/net/http/fs_test.go
@@ -978,9 +978,9 @@ func TestLinuxSendfile(t *testing.T) {
 
 	syscalls := "sendfile,sendfile64"
 	switch runtime.GOARCH {
-	case "mips64", "mips64le":
-		// mips64 strace doesn't support sendfile64 and will error out
-		// if we specify that with `-e trace='.
+	case "mips64", "mips64le", "s390x":
+		// strace on the above platforms doesn't support sendfile64
+		// and will error out if we specify that with `-e trace='.
 		syscalls = "sendfile"
 	}