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>

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 bc7da5e0d574a96a8d5fc7f7dd7f836f1a817ef2..1611a907f00bb89d4fd1ae33f17241162d6dd385 100644 (file)
--- 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 963ed99655babede13a89b54134a1d1810a3a85f..efc67a8eba97566b7a057b1e15b1160c989734d7 100644 (file)
--- 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 d729156de67fdf4cc7d25c311bee620e8ddb6a68..d89cf2996290318b0c1b3d70dbb060a75eb5b1b5 100644 (file)
--- 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 ed13e448b7b4c3ec9214be744a2ea79bb33d2909..b6839dcd8fd72f38ebf4d5e94f0123305eb79e93 100644 (file)
--- 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 46d2fccab588c032e471f65c0ffef3bad8901837..3b8a01e9bb0edd57602b8c5618b73f9e0776c9a4 100644 (file)
--- 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.