summaryrefslogtreecommitdiff
path: root/libgo
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-07-24 13:09:32 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-07-24 13:09:32 +0000
commit760c9d01272ba13254e5e4de7de2eb896983ee55 (patch)
tree3e4fe7717485b5d473750bd9cb6fcb9e670c3fc5 /libgo
parent5dd3943c8af54548b475809c71f717b74548dad6 (diff)
downloadlinaro-gcc-760c9d01272ba13254e5e4de7de2eb896983ee55.tar.gz
linaro-gcc-760c9d01272ba13254e5e4de7de2eb896983ee55.tar.bz2
linaro-gcc-760c9d01272ba13254e5e4de7de2eb896983ee55.zip
net/http: Don't try to trace sendfile64 on alpha.
From Uros Bizjak. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@201206 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
-rw-r--r--libgo/go/net/http/fs_test.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/libgo/go/net/http/fs_test.go b/libgo/go/net/http/fs_test.go
index 2c3737653b3..d38966764b1 100644
--- a/libgo/go/net/http/fs_test.go
+++ b/libgo/go/net/http/fs_test.go
@@ -696,8 +696,13 @@ func TestLinuxSendfile(t *testing.T) {
}
defer ln.Close()
+ trace := "trace=sendfile"
+ if runtime.GOARCH != "alpha" {
+ trace = trace + ",sendfile64"
+ }
+
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, 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