diff --git a/go b/go index 3e79a848530..8ed0e51b5e5 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit 3e79a84853091717c0274281270992f55d2fad04 +Subproject commit 8ed0e51b5e5cc50985444f39dc56c55e4fa3bcf9 diff --git a/patches/0002-net-Skip-TestDialCancel-on-linux-arm64.patch b/patches/0002-net-Skip-TestDialCancel-on-linux-arm64.patch index a2692bd508c..0b6144107b3 100644 --- a/patches/0002-net-Skip-TestDialCancel-on-linux-arm64.patch +++ b/patches/0002-net-Skip-TestDialCancel-on-linux-arm64.patch @@ -9,7 +9,7 @@ The test is flaky on our linux-arm64 builder and gets "network is unreachable". 1 file changed, 4 insertions(+) diff --git a/src/net/dial_test.go b/src/net/dial_test.go -index b9aead0371..f4f383a365 100644 +index 3cce444e5c..d001fc36af 100644 --- a/src/net/dial_test.go +++ b/src/net/dial_test.go @@ -758,6 +758,10 @@ func TestDialerKeepAlive(t *testing.T) { @@ -20,6 +20,6 @@ index b9aead0371..f4f383a365 100644 + t.Skip("skipping on linux-arm64-*; incompatible network config? issue 37330") + } + - blackholeIPPort := JoinHostPort(slowDst4, "1234") - if !supportsIPv4() { - blackholeIPPort = JoinHostPort(slowDst6, "1234") + if strings.HasPrefix(testenv.Builder(), "darwin-arm64") { + // The darwin-arm64 machines run in an environment that's not + // compatible with this test.