]> Cypherpunks repositories - gostls13.git/commitdiff
net/http: fix TestLinuxSendfile on s390x
authorMichael Munday <munday@ca.ibm.com>
Tue, 12 Apr 2016 16:46:54 +0000 (12:46 -0400)
committerBrad Fitzpatrick <bradfitz@golang.org>
Tue, 12 Apr 2016 18:07:23 +0000 (18:07 +0000)
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>
src/net/http/fs_test.go

index 9253ebe43aa44c1f7d735de15af47bf9406463c9..c811891e871958f862d9bdcb15d49a825c3c0849 100644 (file)
@@ -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"
        }