]> Cypherpunks repositories - gostls13.git/commitdiff
net/http: fixed TestLinuxSendfile for mips64
authorYao Zhang <lunaria21@gmail.com>
Thu, 10 Sep 2015 15:33:31 +0000 (11:33 -0400)
committerMinux Ma <minux@golang.org>
Thu, 12 Nov 2015 04:50:57 +0000 (04:50 +0000)
mips64 strace doesn't support sendfile64 and will error out if we
specify that with `-e trace='. So we use sendfile for mips64 here.

Change-Id: If5e2bb39866ca3a77dcc40e4db338ba486921d89
Reviewed-on: https://go-review.googlesource.com/14455
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/net/http/fs_test.go

index a3d64f3a08827a3e9c85dd9aebc92e8d83c31e2f..abfd39377b8d6a3d5002ffac70d773aa7418bf91 100644 (file)
@@ -917,8 +917,16 @@ func TestLinuxSendfile(t *testing.T) {
        }
        defer ln.Close()
 
+       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='.
+               syscalls = "sendfile"
+       }
+
        var buf bytes.Buffer
-       child := exec.Command("strace", "-f", "-q", "-e", "trace=sendfile,sendfile64", os.Args[0], "-test.run=TestLinuxSendfileChild")
+       child := exec.Command("strace", "-f", "-q", "-e", "trace="+syscalls, os.Args[0], "-test.run=TestLinuxSendfileChild")
        child.ExtraFiles = append(child.ExtraFiles, lnf)
        child.Env = append([]string{"GO_WANT_HELPER_PROCESS=1"}, os.Environ()...)
        child.Stdout = &buf