From 45ccea71a17225237a4296190f89710c6e65b7f0 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Mon, 27 Apr 2015 23:46:56 +0000 Subject: [PATCH] Revert "Revert "cmd/dist: consolidate runtime CPU tests"" This reverts commit 81c2233b4abff45e9c781f5e7c50396cfec5a0df. Change-Id: Ie7024f04dba6352ae79ba68d4da5c0c25844cd8c Reviewed-on: https://go-review.googlesource.com/9397 Reviewed-by: Dave Cheney Run-TryBot: Josh Bleecher Snyder TryBot-Result: Gobot Gobot --- 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 112e40a0f3..7ffe5d6f62 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{ -- 2.50.0