From: Russ Cox <rsc@golang.org>
Date: Fri, 2 Aug 2013 17:51:45 +0000 (-0400)
Subject: testing: make parsing of -cpu more lenient
X-Git-Tag: go1.2rc2~818
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=337407d8473d96b11b8c4bd053bce463c347eb06;p=gostls13.git

testing: make parsing of -cpu more lenient

Also add \n to error message.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/12261044
---

diff --git a/src/pkg/testing/testing.go b/src/pkg/testing/testing.go
index 85e751048e..852f4e7a62 100644
--- a/src/pkg/testing/testing.go
+++ b/src/pkg/testing/testing.go
@@ -575,16 +575,19 @@ func stopAlarm() {
 }
 
 func parseCpuList() {
-	if len(*cpuListStr) == 0 {
-		cpuList = append(cpuList, runtime.GOMAXPROCS(-1))
-	} else {
-		for _, val := range strings.Split(*cpuListStr, ",") {
-			cpu, err := strconv.Atoi(val)
-			if err != nil || cpu <= 0 {
-				fmt.Fprintf(os.Stderr, "testing: invalid value %q for -test.cpu", val)
-				os.Exit(1)
-			}
-			cpuList = append(cpuList, cpu)
+	for _, val := range strings.Split(*cpuListStr, ",") {
+		val = strings.TrimSpace(val)
+		if val == "" {
+			continue
 		}
+		cpu, err := strconv.Atoi(val)
+		if err != nil || cpu <= 0 {
+			fmt.Fprintf(os.Stderr, "testing: invalid value %q for -test.cpu\n", val)
+			os.Exit(1)
+		}
+		cpuList = append(cpuList, cpu)
+	}
+	if cpuList == nil {
+		cpuList = append(cpuList, runtime.GOMAXPROCS(-1))
 	}
 }