diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2018-11-28 09:33:19 +0100 |
|---|---|---|
| committer | Tobias Klauser <tobias.klauser@gmail.com> | 2018-11-28 16:27:48 +0000 |
| commit | 71f9f4b84b2974acf723ea78c1c6eb82d6755794 (patch) | |
| tree | 0c3c7e08ce0ee34e8ddba8b0382a0c734c700530 /src/vendor | |
| parent | 5966c2f4ec35c0f1ad53331c552a35f5f6cb3eea (diff) | |
| download | go-71f9f4b84b2974acf723ea78c1c6eb82d6755794.tar.gz go-71f9f4b84b2974acf723ea78c1c6eb82d6755794.zip | |
vendor: update x/net/internal/nettest for aix support
Update golang.org/x/net/internal/nettest to x/net git rev 9b4f9f5ad519
for:
internal/nettest: add AIX operating system
https://golang.org/cl/144077
This fixes the build failure of the vendored x/net/internal/nettest on
aix/ppc64.
Additionally this also pulls in:
all: re-adjust build constraints for JS and NaCl
https://golang.org/cl/122539
Updates #25893
Change-Id: I9abefc7d4ad158e9e68913362f7f1320321d6f5f
Reviewed-on: https://go-review.googlesource.com/c/151301
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/vendor')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/vendor/golang_org/x/net/internal/nettest/helper_nobsd.go b/src/vendor/golang_org/x/net/internal/nettest/helper_nobsd.go index bc7da5e0d5..1611a907f0 100644 --- a/src/vendor/golang_org/x/net/internal/nettest/helper_nobsd.go +++ b/src/vendor/golang_org/x/net/internal/nettest/helper_nobsd.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 linux solaris +// +build aix linux solaris package nettest diff --git a/src/vendor/golang_org/x/net/internal/nettest/helper_posix.go b/src/vendor/golang_org/x/net/internal/nettest/helper_posix.go index 963ed99655..efc67a8eba 100644 --- a/src/vendor/golang_org/x/net/internal/nettest/helper_posix.go +++ b/src/vendor/golang_org/x/net/internal/nettest/helper_posix.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 darwin dragonfly freebsd linux netbsd openbsd solaris windows +// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows package nettest 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 d729156de6..d89cf29962 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 js,wasm nacl plan9 +// +build js nacl plan9 package nettest diff --git a/src/vendor/golang_org/x/net/internal/nettest/helper_unix.go b/src/vendor/golang_org/x/net/internal/nettest/helper_unix.go index ed13e448b7..b6839dcd8f 100644 --- a/src/vendor/golang_org/x/net/internal/nettest/helper_unix.go +++ b/src/vendor/golang_org/x/net/internal/nettest/helper_unix.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 darwin dragonfly freebsd linux netbsd openbsd solaris +// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris 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 46d2fccab5..3b8a01e9bb 100644 --- a/src/vendor/golang_org/x/net/internal/nettest/stack.go +++ b/src/vendor/golang_org/x/net/internal/nettest/stack.go @@ -72,7 +72,7 @@ func TestableNetwork(network string) bool { } case "unixpacket": switch runtime.GOOS { - case "android", "darwin", "freebsd", "js", "nacl", "plan9", "windows": + case "aix", "android", "darwin", "freebsd", "js", "nacl", "plan9", "windows": return false case "netbsd": // It passes on amd64 at least. 386 fails (Issue 22927). arm is unknown. |