1diff --git src/encoding/gob/encoder_test.go src/encoding/gob/encoder_test.go 2index a1ca252ccd..c66e623499 100644 3--- src/encoding/gob/encoder_test.go 4+++ src/encoding/gob/encoder_test.go 5@@ -1130,10 +1130,7 @@ func TestBadData(t *testing.T) { 6 7 // TestHugeWriteFails tests that enormous messages trigger an error. 8 func TestHugeWriteFails(t *testing.T) { 9- if testing.Short() { 10- // Requires allocating a monster, so don't do this from all.bash. 11- t.Skip("skipping huge allocation in short mode") 12- } 13+ t.Skip("skipping test due to huge memory requirement") 14 huge := make([]byte, tooBig) 15 huge[0] = 7 // Make sure it's not all zeros. 16 buf := new(bytes.Buffer) 17diff --git src/runtime/crash_cgo_test.go src/runtime/crash_cgo_test.go 18index 998055972a..60fe2a52d2 100644 19--- src/runtime/crash_cgo_test.old 20+++ src/runtime/crash_cgo_test.go 21@@ -251,10 +251,7 @@ func TestCgoCCodeSIGPROF(t *testing.T) { 22 } 23 24 func TestCgoCrashTraceback(t *testing.T) { 25- t.Parallel() 26- if runtime.GOOS != "linux" || (runtime.GOARCH != "amd64" && runtime.GOARCH != "ppc64le") { 27- t.Skipf("not yet supported on %s/%s", runtime.GOOS, runtime.GOARCH) 28- } 29+ t.Skipf("skip running remotely") 30 got := runTestProg(t, "testprogcgo", "CrashTraceback") 31 for i := 1; i <= 3; i++ { 32 if !strings.Contains(got, fmt.Sprintf("cgo symbolizer:%d", i)) { 33@@ -273,10 +270,7 @@ func TestCgoTracebackContext(t *testing.T) { 34 } 35 36 func testCgoPprof(t *testing.T, buildArg, runArg string) { 37- t.Parallel() 38- if runtime.GOOS != "linux" || (runtime.GOARCH != "amd64" && runtime.GOARCH != "ppc64le") { 39- t.Skipf("not yet supported on %s/%s", runtime.GOOS, runtime.GOARCH) 40- } 41+ t.Skipf("skip pprof test") 42 testenv.MustHaveGoRun(t) 43 44 exe, err := buildTestProg(t, "testprogcgo", buildArg) 45diff --git src/runtime/crash_test.go src/runtime/crash_test.go 46index 3607992788..e53ffb6a81 100644 47--- src/runtime/crash_test.go 48+++ src/runtime/crash_test.go 49@@ -481,6 +481,7 @@ func TestPanicLoop(t *testing.T) { 50 } 51 52 func TestMemPprof(t *testing.T) { 53+ t.Skipf("skip pprof test") 54 testenv.MustHaveGoRun(t) 55 56 exe, err := buildTestProg(t, "testprog") 57diff --git src/runtime/crash_unix_test.go src/runtime/crash_unix_test.go 58index 02891ec1ad..fd2723f16e 100644 59--- src/runtime/crash_unix_test.go 60+++ src/runtime/crash_unix_test.go 61@@ -174,9 +174,7 @@ func TestPanicSystemstack(t *testing.T) { 62 // The GOTRACEBACK=crash handler takes 0.1 seconds even if 63 // it's not writing a core file and potentially much longer if 64 // it is. Skip in short mode. 65- if testing.Short() { 66- t.Skip("Skipping in short mode (GOTRACEBACK=crash is slow)") 67- } 68+ t.Skip("Skipping (GOTRACEBACK=crash hangs on arm)") 69 70 if runtime.Sigisblocked(int(syscall.SIGQUIT)) { 71 t.Skip("skipping; SIGQUIT is blocked, see golang.org/issue/19196") 72@@ -244,6 +242,7 @@ func testPanicSystemstackInternal() { 73 } 74 75 func TestSignalExitStatus(t *testing.T) { 76+ t.Skipf("skip running remotely") 77 testenv.MustHaveGoBuild(t) 78 exe, err := buildTestProg(t, "testprog") 79 if err != nil { 80diff --git src/runtime/fastlog2_test.go src/runtime/fastlog2_test.go 81index ae0f40b2bb..a93933d7ac 100644 82--- src/runtime/fastlog2_test.go 83+++ src/runtime/fastlog2_test.go 84@@ -16,11 +16,7 @@ func TestFastLog2(t *testing.T) { 85 const randomBitCount = 26 86 var e float64 87 88- inc := 1 89- if testing.Short() { 90- // Check 1K total values, down from 64M. 91- inc = 1 << 16 92- } 93+ inc := 1 << 16 94 for i := 1; i < 1<<randomBitCount; i += inc { 95 l, fl := math.Log2(float64(i)), runtime.Fastlog2(float64(i)) 96 d := l - fl 97diff --git src/runtime/hash_test.go src/runtime/hash_test.go 98index 1400579cda..4c5de7fbef 100644 99--- src/runtime/hash_test.go 100+++ src/runtime/hash_test.go 101@@ -161,9 +161,7 @@ func TestSmhasherZeros(t *testing.T) { 102 103 // Strings with up to two nonzero bytes all have distinct hashes. 104 func TestSmhasherTwoNonzero(t *testing.T) { 105- if testing.Short() { 106- t.Skip("Skipping in short mode") 107- } 108+ t.Skip("skipping test due to huge memory requirement") 109 h := newHashSet() 110 for n := 2; n <= 16; n++ { 111 twoNonZero(h, n) 112@@ -264,9 +262,7 @@ func setbits(h *HashSet, b []byte, i int, k int) { 113 // Test all possible combinations of n blocks from the set s. 114 // "permutation" is a bad name here, but it is what Smhasher uses. 115 func TestSmhasherPermutation(t *testing.T) { 116- if testing.Short() { 117- t.Skip("Skipping in short mode") 118- } 119+ t.Skip("skipping test due to huge memory requirement") 120 permutation(t, []uint32{0, 1, 2, 3, 4, 5, 6, 7}, 8) 121 permutation(t, []uint32{0, 1 << 29, 2 << 29, 3 << 29, 4 << 29, 5 << 29, 6 << 29, 7 << 29}, 8) 122 permutation(t, []uint32{0, 1}, 20) 123diff --git src/runtime/pprof/pprof_test.go src/runtime/pprof/pprof_test.go 124index 44d514393e..f46f00894c 100644 125--- src/runtime/pprof/pprof_test.go 126+++ src/runtime/pprof/pprof_test.go 127@@ -283,14 +283,7 @@ func profileOk(t *testing.T, need []string, prof bytes.Buffer, duration time.Dur 128 func TestCPUProfileWithFork(t *testing.T) { 129 testenv.MustHaveExec(t) 130 131- heap := 1 << 30 132- if runtime.GOOS == "android" { 133- // Use smaller size for Android to avoid crash. 134- heap = 100 << 20 135- } 136- if testing.Short() { 137- heap = 100 << 20 138- } 139+ heap = 100 << 20 140 // This makes fork slower. 141 garbage := make([]byte, heap) 142 // Need to touch the slice, otherwise it won't be paged in. 143