internal/testenv: support testing gccgo
If GO_TESTING_GOTOOLS is set in the environment, permit tests using
gccgo to run the go tool. Like GO_BUILDER_NAME, this should not be set
normally. But it is needed when testing the go tool itself, and will
be set by the gotools Makefile in a future CL.
Change-Id: Ifce3185ff03bd966fbc26ae2adbbf2777231630b
Reviewed-on: https://go-review.googlesource.com/45693
Reviewed-by: Than McIntosh <thanm@google.com>
diff --git a/libgo/go/internal/testenv/testenv.go b/libgo/go/internal/testenv/testenv.go
index 71a692b..8d41638 100644
--- a/libgo/go/internal/testenv/testenv.go
+++ b/libgo/go/internal/testenv/testenv.go
@@ -22,6 +22,13 @@
"testing"
)
+// testingGotools reports whether we are testing the gotools directory
+// that is part of GCC. We just use an environment variable set by the
+// gotools check target.
+func testingGotools() bool {
+ return os.Getenv("GO_TESTING_GOTOOLS") != ""
+}
+
// Builder reports the name of the builder running this test
// (for example, "linux-amd64" or "windows-386-gce").
// If the test is not running on the build infrastructure,
@@ -42,14 +49,16 @@
}
}
// gccgo tests can not run "go build".
- return false
+ return testingGotools()
}
// MustHaveGoBuild checks that the current system can build programs with ``go build''
// and then run them with os.StartProcess or exec.Command.
// If not, MustHaveGoBuild calls t.Skip with an explanation.
func MustHaveGoBuild(t *testing.T) {
- t.Skip("skipping test: 'go build' not available for gccgo tests")
+ if !testingGotools() {
+ t.Skip("skipping test: 'go build' not available for gccgo tests")
+ }
if !HasGoBuild() {
t.Skipf("skipping test: 'go build' not available on %s/%s", runtime.GOOS, runtime.GOARCH)
}
@@ -64,7 +73,9 @@
// MustHaveGoRun checks that the current system can run programs with ``go run.''
// If not, MustHaveGoRun calls t.Skip with an explanation.
func MustHaveGoRun(t *testing.T) {
- t.Skip("skipping test: 'go run' not available for gccgo tests")
+ if !testingGotools() {
+ t.Skip("skipping test: 'go run' not available for gccgo tests")
+ }
if !HasGoRun() {
t.Skipf("skipping test: 'go run' not available on %s/%s", runtime.GOOS, runtime.GOARCH)
}
