--- libgo/go/cmd/go/go_test.go.orig	2020-03-04 19:30:03.000000000 +1100
+++ libgo/go/cmd/go/go_test.go	2020-09-08 00:20:34.382477000 +1000
@@ -73,6 +73,14 @@
 				canRun = false
 			}
 		}
+	case "bsdsunix":
+		switch runtime.GOARCH {
+		case "arm":
+			// many bsdsunix/arm machines are too slow to run
+			// the full set of external tests.
+			skipExternal = true
+			canRun = false
+		}
 	case "freebsd":
 		switch runtime.GOARCH {
 		case "arm":
@@ -180,7 +188,7 @@
 		canMSan = canCgo && runtime.GOOS == "linux" && runtime.GOARCH == "amd64"
 
 		switch runtime.GOOS {
-		case "linux", "darwin", "freebsd", "windows":
+		case "bsdsunix", "linux", "darwin", "freebsd", "windows":
 			// The race detector doesn't work on Alpine Linux:
 			// golang.org/issue/14481
 			canRace = canCgo && runtime.GOARCH == "amd64" && !isAlpineLinux() && runtime.Compiler != "gccgo"
@@ -3301,7 +3309,7 @@
 func TestGoGetHTTPS404(t *testing.T) {
 	testenv.MustHaveExternalNetwork(t)
 	switch runtime.GOOS {
-	case "darwin", "linux", "freebsd":
+	case "bsdsunix", "darwin", "linux", "freebsd":
 	default:
 		t.Skipf("test case does not work on %s", runtime.GOOS)
 	}
@@ -3980,6 +3988,8 @@
 		t.Skip("skipping because cgo not enabled")
 	}
 	switch runtime.GOOS {
+	case "bsdsunix":
+		testenv.SkipFlaky(t, 15405)
 	case "freebsd":
 		testenv.SkipFlaky(t, 15405)
 	case "solaris":