From a9e50a6b358df2e725157128c140684264c8ed38 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Fri, 24 Apr 2015 17:06:52 -0700 Subject: [PATCH] cmd/dist: consolidate runtime CPU tests Instead of running: go test -short runtime -cpu=1 go test -short runtime -cpu=2 go test -short runtime -cpu=4 Run just: go test -short runtime -cpu=1,2,4 This is a return to the Go 1.4.2 behavior. We lose incremental display of progress and per-cpu timing information, but we don't have to recompile and relink the runtime test, which is slow. This cuts about 10s off all.bash. Updates #10571. Change-Id: I6e8c7149780d47439f8bcfa888e6efc84290c60a Reviewed-on: https://go-review.googlesource.com/9350 Reviewed-by: Dave Cheney Reviewed-by: Ian Lance Taylor Reviewed-by: Dmitry Vyukov --- src/cmd/dist/test.go | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 112e40a0f36249..7ffe5d6f629130 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -199,21 +199,18 @@ func (t *tester) registerTests() { } // Runtime CPU tests. - for _, cpu := range []string{"1", "2", "4"} { - cpu := cpu - testName := "runtime:cpu" + cpu - t.tests = append(t.tests, distTest{ - name: testName, - heading: "GOMAXPROCS=2 runtime -cpu=1,2,4", - fn: func() error { - cmd := t.dirCmd("src", "go", "test", "-short", t.timeout(300), "runtime", "-cpu="+cpu) - // We set GOMAXPROCS=2 in addition to -cpu=1,2,4 in order to test runtime bootstrap code, - // creation of first goroutines and first garbage collections in the parallel setting. - cmd.Env = mergeEnvLists([]string{"GOMAXPROCS=2"}, os.Environ()) - return cmd.Run() - }, - }) - } + testName := "runtime:cpu124" + t.tests = append(t.tests, distTest{ + name: testName, + heading: "GOMAXPROCS=2 runtime -cpu=1,2,4", + fn: func() error { + cmd := t.dirCmd("src", "go", "test", "-short", t.timeout(300), "runtime", "-cpu=1,2,4") + // We set GOMAXPROCS=2 in addition to -cpu=1,2,4 in order to test runtime bootstrap code, + // creation of first goroutines and first garbage collections in the parallel setting. + cmd.Env = mergeEnvLists([]string{"GOMAXPROCS=2"}, os.Environ()) + return cmd.Run() + }, + }) // sync tests t.tests = append(t.tests, distTest{