diff options
| author | Richard Musiol <mail@richard-musiol.de> | 2018-05-04 19:10:27 +0200 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2018-05-04 17:34:07 +0000 |
| commit | 88d677be96b95cec8cb78abd00a94a613df94b3c (patch) | |
| tree | 09a76621adb3085ba1d6b906186024f4d7d2ee4e /src/vendor | |
| parent | 8aa316c13973bae7693a8710d69a6ec452e490a1 (diff) | |
| download | go-88d677be96b95cec8cb78abd00a94a613df94b3c.tar.xz | |
vendor: update golang.org/x/net/internal/nettest from upstream
Updates to x/net git rev 640f462 for CL 109995.
Change-Id: I081d4c2265c576d61833bdf31ef8e388588053d3
Reviewed-on: https://go-review.googlesource.com/111555
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/vendor')
| -rw-r--r-- | src/vendor/golang_org/x/net/internal/nettest/helper_stub.go | 2 | ||||
| -rw-r--r-- | src/vendor/golang_org/x/net/internal/nettest/stack.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vendor/golang_org/x/net/internal/nettest/helper_stub.go b/src/vendor/golang_org/x/net/internal/nettest/helper_stub.go index ea61b6f399..d729156de6 100644 --- a/src/vendor/golang_org/x/net/internal/nettest/helper_stub.go +++ b/src/vendor/golang_org/x/net/internal/nettest/helper_stub.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build nacl plan9 +// +build js,wasm nacl plan9 package nettest diff --git a/src/vendor/golang_org/x/net/internal/nettest/stack.go b/src/vendor/golang_org/x/net/internal/nettest/stack.go index 06f4e09ef8..46d2fccab5 100644 --- a/src/vendor/golang_org/x/net/internal/nettest/stack.go +++ b/src/vendor/golang_org/x/net/internal/nettest/stack.go @@ -64,7 +64,7 @@ func TestableNetwork(network string) bool { switch network { case "unix", "unixgram": switch runtime.GOOS { - case "android", "nacl", "plan9", "windows": + case "android", "js", "nacl", "plan9", "windows": return false } if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") { @@ -72,7 +72,7 @@ func TestableNetwork(network string) bool { } case "unixpacket": switch runtime.GOOS { - case "android", "darwin", "freebsd", "nacl", "plan9", "windows": + case "android", "darwin", "freebsd", "js", "nacl", "plan9", "windows": return false case "netbsd": // It passes on amd64 at least. 386 fails (Issue 22927). arm is unknown. |