test: limit runoutput tests on arm platforms

runoutput styles tests generally consume a lot of memory. On arm platforms rotate?.go consume around 200mb each to compile, and as tests are sorted alphabetically, they all tend to run at once.

This change limits the number of runoutput jobs to 2 on arm platforms.

R=minux.ma, remyoudompheng, bradfitz, lucio.dere
CC=golang-dev
https://golang.org/cl/7099047

diff --git a/test/run.go b/test/run.go
index c7305d30b84bad41e01b98cc4d6ffac5fd8943ba..fb528fa4ce6f7ccb9739c3d4e80bf3e99cefd66f 100644 (file)
--- a/test/run.go
+++ b/test/run.go
@@ -30,10 +30,11 @@ import (
 )
 
 var (
-       verbose     = flag.Bool("v", false, "verbose. if set, parallelism is set to 1.")
-       numParallel = flag.Int("n", runtime.NumCPU(), "number of parallel tests to run")
-       summary     = flag.Bool("summary", false, "show summary of results")
-       showSkips   = flag.Bool("show_skips", false, "show skipped tests")
+       verbose        = flag.Bool("v", false, "verbose. if set, parallelism is set to 1.")
+       numParallel    = flag.Int("n", runtime.NumCPU(), "number of parallel tests to run")
+       summary        = flag.Bool("summary", false, "show summary of results")
+       showSkips      = flag.Bool("show_skips", false, "show skipped tests")
+       runoutputLimit = flag.Int("l", defaultRunOutputLimit(), "number of parallel runoutput tests to run")
 )
 
 var (
@@ -53,6 +54,10 @@ var (
        // toRun is the channel of tests to run.
        // It is nil until the first test is started.
        toRun chan *test
+
+       // rungatec controls the max number of runoutput tests
+       // executed in parallel as they can each consume a lot of memory.
+       rungatec chan bool
 )
 
 // maxTests is an upper bound on the total number of tests.
@@ -68,6 +73,7 @@ func main() {
        }
 
        ratec = make(chan bool, *numParallel)
+       rungatec = make(chan bool, *runoutputLimit)
        var err error
        letter, err = build.ArchChar(build.Default.GOARCH)
        check(err)
@@ -504,14 +510,17 @@ func (t *test) run() {
                }
 
        case "runoutput":
+               rungatec <- true
+               defer func() {
+                       <-rungatec
+               }()
                useTmp = false
                out, err := runcmd(append([]string{"go", "run", t.goFileName()}, args...)...)
                if err != nil {
                        t.err = err
                }
                tfile := filepath.Join(t.tempDir, "tmp__.go")
-               err = ioutil.WriteFile(tfile, out, 0666)
-               if err != nil {
+               if err := ioutil.WriteFile(tfile, out, 0666); err != nil {
                        t.err = fmt.Errorf("write tempfile:%s", err)
                        return
                }
@@ -735,3 +744,15 @@ var skipOkay = map[string]bool{
        "fixedbugs/bug429.go":    true,
        "bugs/bug395.go":         true,
 }
+
+// defaultRunOutputLimit returns the number of runoutput tests that
+// can be executed in parallel.
+func defaultRunOutputLimit() int {
+       const maxArmCPU = 2
+
+       cpu := runtime.NumCPU()
+       if runtime.GOARCH == "arm" && cpu > maxArmCPU {
+               cpu = maxArmCPU
+       }
+       return cpu
+}