From: Russ Cox <rsc@golang.org>
Date: Wed, 28 May 2014 05:01:08 +0000 (-0400)
Subject: test/run: limit parallelism to 1 for cross-exec builds
X-Git-Tag: go1.3rc1~34
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4895f0dc5edb8c7f8721f9e9eec15524a283cf4a;p=gostls13.git

test/run: limit parallelism to 1 for cross-exec builds

This matters for NaCl, which seems to swamp my 4-core MacBook Pro otherwise.
It's not a correctness problem, just a usability problem.

LGTM=bradfitz
R=bradfitz
CC=golang-codereviews
https://golang.org/cl/98600046
---

diff --git a/test/run.go b/test/run.go
index c96e37dba0..a8d4baa3ac 100644
--- a/test/run.go
+++ b/test/run.go
@@ -71,15 +71,15 @@ const maxTests = 5000
 func main() {
 	flag.Parse()
 
-	// Disable parallelism if printing
-	if *verbose {
-		*numParallel = 1
-	}
-
 	goos = os.Getenv("GOOS")
 	goarch = os.Getenv("GOARCH")
 	findExecCmd()
 
+	// Disable parallelism if printing or if using a simulator.
+	if *verbose || len(findExecCmd()) > 0 {
+		*numParallel = 1
+	}
+
 	ratec = make(chan bool, *numParallel)
 	rungatec = make(chan bool, *runoutputLimit)
 	var err error