Skip to content

Commit 68b204a

Browse files
cmd/dist: let the three runtime -quick tests run simultaneously
For golang#65164 Change-Id: Id797a402fffd70643ebaae74f4450dacfa2b6dd3
1 parent 2f6a25f commit 68b204a

File tree

1 file changed

+31
-4
lines changed

1 file changed

+31
-4
lines changed

src/cmd/dist/test.go

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -705,18 +705,45 @@ func (t *tester) registerTests() {
705705

706706
// Runtime CPU tests.
707707
if !t.compileOnly && t.hasParallelism() {
708-
t.registerTest("GOMAXPROCS=2 runtime -cpu=1,2,4 -quick",
708+
t.registerTest("GOMAXPROCS=2 runtime -cpu=1 -quick",
709709
&goTest{
710-
variant: "cpu124",
710+
variant: "cpu1",
711711
timeout: 300 * time.Second,
712-
cpu: "1,2,4",
712+
cpu: "1",
713713
short: true,
714714
testFlags: []string{"-quick"},
715715
// We set GOMAXPROCS=2 in addition to -cpu=1,2,4 in order to test runtime bootstrap code,
716716
// creation of first goroutines and first garbage collections in the parallel setting.
717717
env: []string{"GOMAXPROCS=2"},
718718
pkg: "runtime",
719-
})
719+
},
720+
)
721+
t.registerTest("GOMAXPROCS=2 runtime -cpu=2 -quick",
722+
&goTest{
723+
variant: "cpu2",
724+
timeout: 300 * time.Second,
725+
cpu: "2",
726+
short: true,
727+
testFlags: []string{"-quick"},
728+
// We set GOMAXPROCS=2 in addition to -cpu=1,2,4 in order to test runtime bootstrap code,
729+
// creation of first goroutines and first garbage collections in the parallel setting.
730+
env: []string{"GOMAXPROCS=2"},
731+
pkg: "runtime",
732+
},
733+
)
734+
t.registerTest("GOMAXPROCS=2 runtime -cpu=4 -quick",
735+
&goTest{
736+
variant: "cpu4",
737+
timeout: 300 * time.Second,
738+
cpu: "4",
739+
short: true,
740+
testFlags: []string{"-quick"},
741+
// We set GOMAXPROCS=2 in addition to -cpu=1,2,4 in order to test runtime bootstrap code,
742+
// creation of first goroutines and first garbage collections in the parallel setting.
743+
env: []string{"GOMAXPROCS=2"},
744+
pkg: "runtime",
745+
},
746+
)
720747
}
721748

722749
// GOEXPERIMENT=rangefunc tests

0 commit comments

Comments
 (0)