From: Shenghou Ma Date: Wed, 23 Sep 2015 22:53:16 +0000 (-0400) Subject: cmd/dist: fix build after "go test" argument order change X-Git-Tag: go1.6beta1~991 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2c96e5d2fc0a0765397a86d1e0d7c9329479d4bb;p=gostls13.git cmd/dist: fix build after "go test" argument order change Change-Id: I332cd4a4b48cbb52d2beeb16c4a24833bb7069d7 Reviewed-on: https://go-review.googlesource.com/14890 Reviewed-by: Ian Lance Taylor --- diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index ad7bd09ceb..0e9666bc91 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(), "runtime", "-cpu=1,2,4") + cmd := t.dirCmd("src", "go", "test", "-short", t.timeout(300), t.tags(), "-cpu=1,2,4", "runtime") // 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()) @@ -364,7 +364,7 @@ func (t *tester) registerTests() { name: "sync_cpu", heading: "sync -cpu=10", fn: func() error { - return t.dirCmd("src", "go", "test", "sync", "-short", t.timeout(120), t.tags(), "-cpu=10").Run() + return t.dirCmd("src", "go", "test", "-short", t.timeout(120), t.tags(), "-cpu=10", "sync").Run() }, })