cmd/dist: skip race detector test failure for unsupported VMA
Fixes #29948
Change-Id: I01d041655d34a5de32701dec8b360e347593a45d
Reviewed-on: https://go-review.googlesource.com/c/go/+/160919
Reviewed-by: Russ Cox <rsc@golang.org>
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index df86ae7..577a20b 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -1103,6 +1103,13 @@
} else {
timelog("start", w.dt.name)
w.out, w.err = w.cmd.CombinedOutput()
+ if w.err != nil {
+ if isUnsupportedVMASize(w) {
+ timelog("skip", w.dt.name)
+ w.out = []byte(fmt.Sprintf("skipped due to unsupported VMA\n"))
+ w.err = nil
+ }
+ }
}
timelog("end", w.dt.name)
w.end <- true
@@ -1383,6 +1390,11 @@
// raceDetectorSupported is a copy of the function
// cmd/internal/sys.RaceDetectorSupported, which can't be used here
// because cmd/dist has to be buildable by Go 1.4.
+// The race detector only supports 48-bit VMA on arm64. But we don't have
+// a good solution to check VMA size(See https://golang.org/issue/29948)
+// raceDetectorSupported will always return true for arm64. But race
+// detector tests may abort on non 48-bit VMA configuration, the tests
+// will be marked as "skipped" in this case.
func raceDetectorSupported(goos, goarch string) bool {
switch goos {
case "linux":
@@ -1404,3 +1416,11 @@
return false
}
}
+
+// isUnsupportedVMASize reports whether the failure is caused by an unsupported
+// VMA for the race detector (for example, running the race detector on an
+// arm64 machine configured with 39-bit VMA)
+func isUnsupportedVMASize(w *work) bool {
+ unsupportedVMA := []byte("unsupported VMA range")
+ return w.dt.name == "race" && bytes.Contains(w.out, unsupportedVMA)
+}
diff --git a/src/cmd/internal/sys/supported.go b/src/cmd/internal/sys/supported.go
index c963971..df26f97 100644
--- a/src/cmd/internal/sys/supported.go
+++ b/src/cmd/internal/sys/supported.go
@@ -6,6 +6,9 @@
// RaceDetectorSupported reports whether goos/goarch supports the race
// detector. There is a copy of this function in cmd/dist/test.go.
+// Race detector only supports 48-bit VMA on arm64. But it will always
+// return true for arm64, because we don't have VMA size information during
+// the compile time.
func RaceDetectorSupported(goos, goarch string) bool {
switch goos {
case "linux":
