diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2013-07-24 13:09:32 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2013-07-24 13:09:32 +0000 |
| commit | 017e07a1184c93792a0099b8ec1e242351ebe451 (patch) | |
| tree | 3e4fe7717485b5d473750bd9cb6fcb9e670c3fc5 /libgo | |
| parent | c9150e8bda63a8d12414f7d9c4acae94ac892bb2 (diff) | |
| download | gcc-017e07a1184c93792a0099b8ec1e242351ebe451.zip gcc-017e07a1184c93792a0099b8ec1e242351ebe451.tar.gz gcc-017e07a1184c93792a0099b8ec1e242351ebe451.tar.bz2 | |
net/http: Don't try to trace sendfile64 on alpha.
From Uros Bizjak.
From-SVN: r201206
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/net/http/fs_test.go | 7 |
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 2c37376..d389667 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 |