libgo: Fix go/runtime test failure on S390.

The tests run out of memory on 31-bit S390 systems because
it does not have split stacks.

From-SVN: r221681

diff --git a/libgo/go/runtime/chan_test.go b/libgo/go/runtime/chan_test.go
index e689ceaed1e1b2eecebfad8bb37c4ed15e41d39c..4fb305c8ae36562f6cb74a0758175b5bde474252 100644 (file)
--- 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 7e4da902e7f1a626de4638350c97460708e545b5..9ed183bb9d1c6a76fe6f5b41c0460ac99ce236b5 100644 (file)
--- 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