From eebf7d279bd2991d54f18a629d4f3c32d7a58f2b Mon Sep 17 00:00:00 2001 From: Yao Zhang Date: Thu, 10 Sep 2015 11:33:31 -0400 Subject: [PATCH] net/http: fixed TestLinuxSendfile for mips64 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 Reviewed-by: Brad Fitzpatrick --- src/net/http/fs_test.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/net/http/fs_test.go b/src/net/http/fs_test.go index a3d64f3a08..abfd39377b 100644 --- a/src/net/http/fs_test.go +++ b/src/net/http/fs_test.go @@ -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 -- 2.48.1