diff options
| author | Russ Cox <rsc@golang.org> | 2015-12-14 11:22:04 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-12-17 01:43:47 +0000 |
| commit | 5c596b51fd4745d4e1aa9701bee8d04f897097ae (patch) | |
| tree | 791d7c63fadc7ca3400fb503d16333c4d5f1f0f8 | |
| parent | e5ba367c10c8d819841da5ec3661d3d20fc1e765 (diff) | |
| download | go-5c596b51fd4745d4e1aa9701bee8d04f897097ae.tar.gz go-5c596b51fd4745d4e1aa9701bee8d04f897097ae.zip | |
Revert "cmd/dist: fix build after "go test" argument order change"
No longer needed - the change to 'go test' was rolled back.
This reverts commit 2c96e5d2fc0a0765397a86d1e0d7c9329479d4bb.
Change-Id: Ibe9c5f48e3e4cbbbde2f5c8c516b2987ebba55ae
Reviewed-on: https://go-review.googlesource.com/17776
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
| -rw-r--r-- | src/cmd/dist/test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index da973a7a06..f2b0796130 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -351,7 +351,7 @@ func (t *tester) registerTests() { name: testName, heading: "GOMAXPROCS=2 runtime -cpu=1,2,4", fn: func() error { - cmd := t.dirCmd("src", "go", "test", "-short", t.timeout(300), t.tags(), "-cpu=1,2,4", "runtime") + cmd := t.dirCmd("src", "go", "test", "-short", t.timeout(300), t.tags(), "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()) @@ -395,7 +395,7 @@ func (t *tester) registerTests() { name: "sync_cpu", heading: "sync -cpu=10", fn: func() error { - return t.dirCmd("src", "go", "test", "-short", t.timeout(120), t.tags(), "-cpu=10", "sync").Run() + return t.dirCmd("src", "go", "test", "sync", "-short", t.timeout(120), t.tags(), "-cpu=10").Run() }, }) |