diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2013-03-04 21:27:43 +0100 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2013-03-04 21:27:43 +0100 |
| commit | ad47422646a18ffcb47cec916ef7393c923f2e76 (patch) | |
| tree | 7c7861fb3d9539d61c1dcfd5b8dadee974c25760 /src/pkg/net/file_test.go | |
| parent | 2c8d5d584a79781ca41bb6f4b396893fbbac5b97 (diff) | |
| parent | 04b08da9af0c450d645ab7389d1467308cfc2db8 (diff) | |
| download | golang-ad47422646a18ffcb47cec916ef7393c923f2e76.tar.gz | |
Merge tag 'upstream/1.1_hg20130304' into debian-sid
Upstream version 1.1~hg20130304
Diffstat (limited to 'src/pkg/net/file_test.go')
| -rw-r--r-- | src/pkg/net/file_test.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/pkg/net/file_test.go b/src/pkg/net/file_test.go index 95c0b6699..acaf18851 100644 --- a/src/pkg/net/file_test.go +++ b/src/pkg/net/file_test.go @@ -89,9 +89,8 @@ var fileListenerTests = []struct { func TestFileListener(t *testing.T) { switch runtime.GOOS { - case "plan9", "windows": - t.Logf("skipping test on %q", runtime.GOOS) - return + case "windows": + t.Skipf("skipping test on %q", runtime.GOOS) } for _, tt := range fileListenerTests { @@ -181,8 +180,7 @@ var filePacketConnTests = []struct { func TestFilePacketConn(t *testing.T) { switch runtime.GOOS { case "plan9", "windows": - t.Logf("skipping test on %q", runtime.GOOS) - return + t.Skipf("skipping test on %q", runtime.GOOS) } for _, tt := range filePacketConnTests { |