1 files changed, 23 insertions, 9 deletions
diff --git a/test/runner/gtest/gtest.go b/test/runner/gtest/gtest.go
index 23bf7b5f6..869169ad5 100644
--- a/test/runner/gtest/gtest.go
+++ b/test/runner/gtest/gtest.go
@@ -43,6 +43,10 @@ type TestCase struct {
 	// Name is the name of this individual test.
 	Name string
 
+	// all indicates that this will run without flags. This takes
+	// precendence over benchmark below.
+	all bool
+
 	// benchmark indicates that this is a benchmark. In this case, the
 	// suite will be empty, and we will use the appropriate test and
 	// benchmark flags.
@@ -57,15 +61,17 @@ func (tc TestCase) FullName() string {
 
 // Args returns arguments to be passed when invoking the test.
 func (tc TestCase) Args() []string {
+	if tc.all {
+		return []string{} // No arguments.
+	}
 	if tc.benchmark {
 		return []string{
-			fmt.Sprintf("%s=^$", filterTestFlag),
 			fmt.Sprintf("%s=^%s$", filterBenchmarkFlag, tc.Name),
+			fmt.Sprintf("%s=", filterTestFlag),
 		}
 	}
 	return []string{
-		fmt.Sprintf("%s=^%s$", filterTestFlag, tc.FullName()),
-		fmt.Sprintf("%s=^$", filterBenchmarkFlag),
+		fmt.Sprintf("%s=%s", filterTestFlag, tc.FullName()),
 	}
 }
 
@@ -81,11 +87,16 @@ func ParseTestCases(testBin string, benchmarks bool, extraArgs ...string) ([]Tes
 	cmd := exec.Command(testBin, args...)
 	out, err := cmd.Output()
 	if err != nil {
-		exitErr, ok := err.(*exec.ExitError)
-		if !ok {
-			return nil, fmt.Errorf("could not enumerate gtest tests: %v", err)
-		}
-		return nil, fmt.Errorf("could not enumerate gtest tests: %v\nstderr:\n%s", err, exitErr.Stderr)
+		// We failed to list tests with the given flags. Just
+		// return something that will run the binary with no
+		// flags, which should execute all tests.
+		return []TestCase{
+			TestCase{
+				Suite: "Default",
+				Name:  "All",
+				all:   true,
+			},
+		}, nil
 	}
 
 	// Parse test output.
@@ -114,7 +125,6 @@ func ParseTestCases(testBin string, benchmarks bool, extraArgs ...string) ([]Tes
 			Suite: suite,
 			Name:  name,
 		})
-
 	}
 
 	// Finished?
@@ -127,6 +137,8 @@ func ParseTestCases(testBin string, benchmarks bool, extraArgs ...string) ([]Tes
 	cmd = exec.Command(testBin, args...)
 	out, err = cmd.Output()
 	if err != nil {
+		// We were able to enumerate tests above, but not benchmarks?
+		// We requested them, so we return an error in this case.
 		exitErr, ok := err.(*exec.ExitError)
 		if !ok {
 			return nil, fmt.Errorf("could not enumerate gtest benchmarks: %v", err)
@@ -134,6 +146,8 @@ func ParseTestCases(testBin string, benchmarks bool, extraArgs ...string) ([]Tes
 		return nil, fmt.Errorf("could not enumerate gtest benchmarks: %v\nstderr\n%s", err, exitErr.Stderr)
 	}
 
+	out = []byte(strings.Trim(string(out), "\n"))
+
 	// Parse benchmark output.
 	for _, line := range strings.Split(string(out), "\n") {
 		// Strip comments.