cmd/dist: move guts of race.bash into dist

After a little build coordinator change, this will get us sharding of
the race builder.

Update #11074

Change-Id: I4c55267563b6f5e213def7dd6707c837ae2106bf
Reviewed-on: https://go-review.googlesource.com/10845
Reviewed-by: Andrew Gerrand <adg@golang.org>

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 9ae9398cc757e8e819bc3c8e0cbbc331beef32a2..a6a8e01d56956226d92aefbbe6a93b348ff1e2f7 100644 (file)
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -24,6 +24,7 @@ func cmdtest() {
        flag.BoolVar(&t.listMode, "list", false, "list available tests")
        flag.BoolVar(&t.noRebuild, "no-rebuild", false, "don't rebuild std and cmd packages")
        flag.BoolVar(&t.keepGoing, "k", false, "keep going even when error occurred")
+       flag.BoolVar(&t.race, "race", false, "run in race builder mode (different set of tests)")
        flag.StringVar(&t.banner, "banner", "##### ", "banner prefix; blank means no section banners")
        flag.StringVar(&t.runRxStr, "run", os.Getenv("GOTESTONLY"),
                "run only those tests matching the regular expression; empty means to run all. "+
@@ -34,6 +35,7 @@ func cmdtest() {
 
 // tester executes cmdtest.
 type tester struct {
+       race      bool
        listMode  bool
        noRebuild bool
        keepGoing bool
@@ -229,9 +231,15 @@ func (t *tester) timeout(sec int) string {
 // ranGoTest and stdMatches are state closed over by the stdlib
 // testing func in registerStdTest below. The tests are run
 // sequentially, so there's no need for locks.
+//
+// ranGoBench and benchMatches are the same, but are only used
+// in -race mode.
 var (
        ranGoTest  bool
        stdMatches []string
+
+       ranGoBench   bool
+       benchMatches []string
 )
 
 func (t *tester) registerStdTest(pkg string) {
@@ -247,13 +255,49 @@ func (t *tester) registerStdTest(pkg string) {
                                return nil
                        }
                        ranGoTest = true
-                       cmd := exec.Command("go", append([]string{
+                       args := []string{
                                "test",
                                "-short",
                                t.tags(),
                                t.timeout(120),
                                "-gcflags=" + os.Getenv("GO_GCFLAGS"),
-                       }, stdMatches...)...)
+                       }
+                       if t.race {
+                               args = append(args, "-race")
+                       }
+                       args = append(args, stdMatches...)
+                       cmd := exec.Command("go", args...)
+                       cmd.Stdout = os.Stdout
+                       cmd.Stderr = os.Stderr
+                       return cmd.Run()
+               },
+       })
+}
+
+func (t *tester) registerRaceBenchTest(pkg string) {
+       testName := "go_test_bench:" + pkg
+       if t.runRx == nil || t.runRx.MatchString(testName) {
+               benchMatches = append(benchMatches, pkg)
+       }
+       t.tests = append(t.tests, distTest{
+               name:    testName,
+               heading: "Running benchmarks briefly.",
+               fn: func() error {
+                       if ranGoBench {
+                               return nil
+                       }
+                       ranGoBench = true
+                       args := []string{
+                               "test",
+                               "-short",
+                               "-race",
+                               "-run=^$", // nothing. only benchmarks.
+                               "-bench=.*",
+                               "-benchtime=.1s",
+                               "-cpu=4",
+                       }
+                       args = append(args, benchMatches...)
+                       cmd := exec.Command("go", args...)
                        cmd.Stdout = os.Stdout
                        cmd.Stderr = os.Stderr
                        return cmd.Run()
@@ -270,17 +314,34 @@ func (t *tester) registerTests() {
                        if strings.HasPrefix(name, "go_test:") {
                                t.registerStdTest(strings.TrimPrefix(name, "go_test:"))
                        }
+                       if strings.HasPrefix(name, "go_test_bench:") {
+                               t.registerRaceBenchTest(strings.TrimPrefix(name, "go_test_bench:"))
+                       }
                }
        } else {
                // Use a format string to only list packages and commands that have tests.
                const format = "{{if (or .TestGoFiles .XTestGoFiles)}}{{.ImportPath}}{{end}}"
-               all, err := exec.Command("go", "list", "-f", format, "std", "cmd").CombinedOutput()
+               cmd := exec.Command("go", "list", "-f", format, "std")
+               if !t.race {
+                       cmd.Args = append(cmd.Args, "cmd")
+               }
+               all, err := cmd.CombinedOutput()
                if err != nil {
                        log.Fatalf("Error running go list std cmd: %v, %s", err, all)
                }
-               for _, pkg := range strings.Fields(string(all)) {
+               pkgs := strings.Fields(string(all))
+               for _, pkg := range pkgs {
                        t.registerStdTest(pkg)
                }
+               if t.race {
+                       for _, pkg := range pkgs {
+                               t.registerRaceBenchTest(pkg)
+                       }
+               }
+       }
+
+       if t.race {
+               return
        }
 
        // Runtime CPU tests.

diff --git a/src/race.bash b/src/race.bash
index b305c8f970ebd4cf577b71070ff60277ffd68b46..f1543c403ada869cb9f941e0112678fb38dfc9ce 100755 (executable)
--- a/src/race.bash
+++ b/src/race.bash
@@ -41,11 +41,4 @@ if [ ! -f make.bash ]; then
 fi
 . ./make.bash --no-banner
 go install -race std
-
-# we must unset GOROOT_FINAL before tests, because runtime/debug requires
-# correct access to source code, so if we have GOROOT_FINAL in effect,
-# at least runtime/debug test will fail.
-unset GOROOT_FINAL
-
-go test -race -short std
-go test -race -run=nothingplease -bench=.* -benchtime=.1s -cpu=4 std
+go tool dist test -no-rebuild -race

diff --git a/src/race.bat b/src/race.bat
index 1ab019c25a575385516b81553d5349ccdb1453c6..83e62839ba7ac0d584f4477766107e881966df8e 100644 (file)
--- a/src/race.bat
+++ b/src/race.bat
@@ -34,16 +34,8 @@ echo # go install -race std
 go install -race std
 if errorlevel 1 goto fail
 
-:: we must unset GOROOT_FINAL before tests, because runtime/debug requires
-:: correct access to source code, so if we have GOROOT_FINAL in effect,
-:: at least runtime/debug test will fail.
-set GOROOT_FINAL=
+go tool dist test -no-rebuild -race
 
-echo # go test -race -short std
-go test -race -short std
-if errorlevel 1 goto fail
-echo # go test -race -run=nothingplease -bench=.* -benchtime=.1s -cpu=4 std
-go test -race -run=nothingplease -bench=.* -benchtime=.1s -cpu=4 std
 if errorlevel 1 goto fail
 goto succ