diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-26 00:39:45 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-26 00:39:45 +0000 |
| commit | 8b0fa8b98d77e4dae131218c8e89b3b08d094d67 (patch) | |
| tree | d7be665993dd21c575d2c963f18e286386e5b84b /libgo | |
| parent | 8337a80c40c133c525d6c338d28be98cc7581f47 (diff) | |
| download | gcc-8b0fa8b98d77e4dae131218c8e89b3b08d094d67.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221681 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
| -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 e689ceaed1e..4fb305c8ae3 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 7e4da902e7f..9ed183bb9d1 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 |