Commit d94a1e7f by Ian Lance Taylor

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
parent d9c14be9
...@@ -202,6 +202,11 @@ func TestNonblockRecvRace(t *testing.T) { ...@@ -202,6 +202,11 @@ func TestNonblockRecvRace(t *testing.T) {
n := 10000 n := 10000
if testing.Short() { if testing.Short() {
n = 100 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++ { for i := 0; i < n; i++ {
c := make(chan int, 1) c := make(chan int, 1)
......
...@@ -243,7 +243,12 @@ func TestIterGrowWithGC(t *testing.T) { ...@@ -243,7 +243,12 @@ func TestIterGrowWithGC(t *testing.T) {
func testConcurrentReadsAfterGrowth(t *testing.T, useReflect bool) { func testConcurrentReadsAfterGrowth(t *testing.T, useReflect bool) {
if runtime.GOMAXPROCS(-1) == 1 { 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 numLoop := 10
numGrowStep := 250 numGrowStep := 250
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment