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 85e751048e21ee4109f73df0443d3e1725d66a28..852f4e7a62c5977f60a5ec967d04f8c9ae5cdcfa 100644 (file)
--- 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))
        }
 }