Merge pull request #495 from constabulary/add-race-missing-warning

cmd/gb: refuse to run if -race support missing
constabulary · Dec 16, 2015 · 21b03e9 · 21b03e9
2 parents ab2fed9 + e15e7a6
commit 21b03e9
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 22 deletions.
diff --git a/cmd/gb/gb_test.go b/cmd/gb/gb_test.go
@@ -46,14 +46,6 @@ func init() {
 		}
 	}
 
-	_, err := os.Stat(filepath.Join(runtime.GOROOT(), "pkg", fmt.Sprintf("%s_%s_race", runtime.GOOS, runtime.GOARCH)))
-	switch {
-	case os.IsNotExist(err):
-		log.Printf("go installation at %s is missing race support", runtime.GOROOT())
-	case runtime.GOARCH == "amd64":
-		canRace = runtime.GOOS == "linux" || runtime.GOOS == "freebsd" || runtime.GOOS == "windows" || runtime.GOOS == "darwin"
-	}
-
 	switch runtime.GOOS {
 	case "windows":
 		exeSuffix = ".exe"
@@ -79,11 +71,13 @@ func TestMain(m *testing.M) {
 			os.Exit(2)
 		}
 
-		switch runtime.GOOS {
-		case "linux", "darwin", "freebsd", "windows":
-			canRace = canCgo && runtime.GOARCH == "amd64"
+		_, err = os.Stat(filepath.Join(runtime.GOROOT(), "pkg", fmt.Sprintf("%s_%s_race", runtime.GOOS, runtime.GOARCH), "runtime.a"))
+		switch {
+		case os.IsNotExist(err):
+			log.Printf("go installation at %s is missing race support", runtime.GOROOT())
+		case runtime.GOARCH == "amd64":
+			canRace = runtime.GOOS == "linux" || runtime.GOOS == "freebsd" || runtime.GOOS == "windows" || runtime.GOOS == "darwin"
 		}
-		defer os.RemoveAll(dir)
 	}
 
 	// Don't let these environment variables confuse the test.
@@ -1259,9 +1253,6 @@ func TestTestRaceFlag(t *testing.T) {
 	if !canRace {
 		t.Skip("skipping because race detector not supported")
 	}
-	if strings.HasPrefix(runtime.Version(), "go1.4") {
-		t.Skipf("skipping race test as Go version %v incorrectly marks race failures as success", runtime.Version())
-	}
 
 	gb := T{T: t}
 	defer gb.cleanup()
@@ -1274,10 +1265,6 @@ func TestTestRaceFlag(t *testing.T) {
 import "testing"
 
 func TestRaceFlag(t *testing.T) {
-        if !canRace {
-                t.Skip("skipping because race detector not supported")
-        }
-
 	if A != 1 || B != 2 {
 		t.Fatal("expected", 1, 2,"got", A, B)
 	}
@@ -1297,6 +1284,40 @@ func TestTestRace(t *testing.T) {
 	if !canRace {
 		t.Skip("skipping because race detector not supported")
 	}
+	if strings.HasPrefix(runtime.Version(), "go1.4") {
+		t.Skipf("skipping race test as Go version %v incorrectly marks race failures as success", runtime.Version())
+	}
+
+	gb := T{T: t}
+	defer gb.cleanup()
+
+	gb.tempDir("src/race")
+	gb.tempFile("src/race/map_test.go", `package race
+import "testing"
+
+func TestRaceMapRW(t *testing.T) {
+        m := make(map[int]int)
+        ch := make(chan bool, 1)
+        go func() {
+                _ = m[1]
+                ch <- true
+        }()
+        m[1] = 1
+        <-ch
+}
+`)
+	gb.cd(gb.tempdir)
+	tmpdir := gb.tempDir("tmp")
+	gb.setenv("TMP", tmpdir)
+	gb.runFail("test", "-race")
+	gb.mustBeEmpty(tmpdir)
+}
+
+// check that missing -race support generates error message.
+func TestRaceMissing(t *testing.T) {
+	if canRace {
+		t.Skip("skipping because race detector is available")
+	}
 
 	gb := T{T: t}
 	defer gb.cleanup()
@@ -1320,5 +1341,6 @@ func TestRaceMapRW(t *testing.T) {
 	tmpdir := gb.tempDir("tmp")
 	gb.setenv("TMP", tmpdir)
 	gb.runFail("test", "-race")
+	gb.grepStderr(regexp.QuoteMeta(fmt.Sprintf("FATAL: go installation at %s is missing race support", runtime.GOROOT())), "expected missing race support message")
 	gb.mustBeEmpty(tmpdir)
 }
diff --git a/cmd/gb/main.go b/cmd/gb/main.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 
 	"github.com/constabulary/gb"
 	"github.com/constabulary/gb/cmd"
@@ -129,10 +130,17 @@ func main() {
 		gb.Ldflags(ldflags...),
 		gb.Tags(buildtags...),
 		func(c *gb.Context) error {
-			if race {
-				return gb.WithRace(c)
+			if !race {
+				return nil
 			}
-			return nil
+
+			// check the race runtime is built
+			_, err := os.Stat(filepath.Join(runtime.GOROOT(), "pkg", fmt.Sprintf("%s_%s_race", runtime.GOOS, runtime.GOARCH), "runtime.a"))
+			if os.IsNotExist(err) || err != nil {
+				fatalf("go installation at %s is missing race support. See https://getgb.io/faq/#missing-race-support", runtime.GOROOT())
+			}
+
+			return gb.WithRace(c)
 		},
 	)