diff options
| -rw-r--r-- | libgo/go/runtime/chan_test.go | 5 | ||||
| -rw-r--r-- | libgo/go/runtime/map_test.go | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libgo/go/runtime/chan_test.go b/libgo/go/runtime/chan_test.go index e689cea..4fb305c 100644 --- a/libgo/go/runtime/chan_test.go +++ b/libgo/go/runtime/chan_test.go @@ -202,6 +202,11 @@ func TestNonblockRecvRace(t *testing.T) { n := 10000 if testing.Short() { n = 100 + } else { + if runtime.GOARCH == "s390" { + // Test uses too much address space on 31-bit S390. + t.Skip("skipping long test on s390") + } } for i := 0; i < n; i++ { c := make(chan int, 1) diff --git a/libgo/go/runtime/map_test.go b/libgo/go/runtime/map_test.go index 7e4da90..9ed183b 100644 --- a/libgo/go/runtime/map_test.go +++ b/libgo/go/runtime/map_test.go @@ -243,7 +243,12 @@ func TestIterGrowWithGC(t *testing.T) { func testConcurrentReadsAfterGrowth(t *testing.T, useReflect bool) { if runtime.GOMAXPROCS(-1) == 1 { - defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(16)) + if runtime.GOARCH == "s390" { + // Test uses too much address space on 31-bit S390. + defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(8)) + } else { + defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(16)) + } } numLoop := 10 numGrowStep := 250 |