--- a/libgo/misc/cgo/test/issue18146.go	Fri Oct 27 22:46:09 2017 +0900
+++ b/libgo/misc/cgo/test/issue18146.go	Thu Oct 25 07:37:49 2018 +0900
@@ -22,6 +22,10 @@
 )
 
 func test18146(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping in short mode")
+	}
+
 	if runtime.GOOS == "darwin" {
 		t.Skipf("skipping flaky test on %s; see golang.org/issue/18202", runtime.GOOS)
 	}
@@ -33,10 +37,6 @@
 	attempts := 1000
 	threads := 4
 
-	if testing.Short() {
-		attempts = 100
-	}
-
 	// Restrict the number of attempts based on RLIMIT_NPROC.
 	// Tediously, RLIMIT_NPROC was left out of the syscall package,
 	// probably because it is not in POSIX.1, so we define it here.