public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* libgo patch committed: Avoid some s390 failures
@ 2015-03-26  0:39 Ian Lance Taylor
  0 siblings, 0 replies; only message in thread
From: Ian Lance Taylor @ 2015-03-26  0:39 UTC (permalink / raw)
  To: gcc-patches, gofrontend-dev

[-- Attachment #1: Type: text/plain, Size: 140 bytes --]

This patch from Dominik Vogt fixes some s390 failures in libgo.  Ran
Go testsuite on x86_64-unknown-linux-gnu.  Committed to mainline.

Ian

[-- Attachment #2: foo.txt --]
[-- Type: text/plain, Size: 1070 bytes --]

diff -r bdce421e579e libgo/go/runtime/chan_test.go
--- a/libgo/go/runtime/chan_test.go	Wed Mar 25 14:16:52 2015 -0700
+++ b/libgo/go/runtime/chan_test.go	Wed Mar 25 17:39:06 2015 -0700
@@ -202,6 +202,11 @@
 	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 -r bdce421e579e libgo/go/runtime/map_test.go
--- a/libgo/go/runtime/map_test.go	Wed Mar 25 14:16:52 2015 -0700
+++ b/libgo/go/runtime/map_test.go	Wed Mar 25 17:39:06 2015 -0700
@@ -243,7 +243,12 @@
 
 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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-03-26  0:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-26  0:39 libgo patch committed: Avoid some s390 failures Ian Lance Taylor

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).