aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2015-09-01 22:26:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-09-01 22:26:29 +0000
commitb76baca83f6252a55cef2a577d6ee19d07f35c9d (patch)
tree2732a23e1d590cf43908ee3844cc1af6d38d1aa0
parent53091937714852364440ce4966d5457ad7e25e98 (diff)
parent874e71548b2fdfcdd34fe7ddc9a7839f3bf013bb (diff)
downloadtools-b76baca83f6252a55cef2a577d6ee19d07f35c9d.tar.gz
go/ssa/interp: exclude another long-running test if -short is set
automerge: 874e715 * commit '874e71548b2fdfcdd34fe7ddc9a7839f3bf013bb': go/ssa/interp: exclude another long-running test if -short is set
-rw-r--r--go/ssa/interp/interp_test.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/go/ssa/interp/interp_test.go b/go/ssa/interp/interp_test.go
index c914c6d..89e23bd 100644
--- a/go/ssa/interp/interp_test.go
+++ b/go/ssa/interp/interp_test.go
@@ -307,7 +307,7 @@ func TestTestdataFiles(t *testing.T) {
// TestGorootTest runs the interpreter on $GOROOT/test/*.go.
func TestGorootTest(t *testing.T) {
if testing.Short() {
- return // too slow (~30s)
+ t.Skip() // too slow (~30s)
}
var failures []string
@@ -327,6 +327,10 @@ func TestGorootTest(t *testing.T) {
// TestTestmainPackage runs the interpreter on a synthetic "testmain" package.
func TestTestmainPackage(t *testing.T) {
+ if testing.Short() {
+ t.Skip() // too slow on some platforms
+ }
+
success := func(exitcode int, output string) error {
if exitcode == 0 {
return fmt.Errorf("unexpected success")