1 files changed, 10 insertions, 3 deletions
diff --git a/test/util/test_util_impl.cc b/test/util/test_util_impl.cc
index 7e1ad9e66..6b6826898 100644
--- a/test/util/test_util_impl.cc
+++ b/test/util/test_util_impl.cc
@@ -20,6 +20,7 @@
 #include "benchmark/benchmark.h"
 #include "test/util/logging.h"
 
+extern bool FLAGS_gtest_list_tests;
 extern bool FLAGS_benchmark_list_tests;
 extern std::string FLAGS_benchmark_filter;
 
@@ -40,12 +41,18 @@ void TestInit(int* argc, char*** argv) {
 }
 
 int RunAllTests() {
-  if (FLAGS_benchmark_list_tests || FLAGS_benchmark_filter != ".") {
+  if (::testing::FLAGS_gtest_list_tests) {
+    return RUN_ALL_TESTS();
+  }
+  if (FLAGS_benchmark_list_tests) {
     benchmark::RunSpecifiedBenchmarks();
     return 0;
-  } else {
-    return RUN_ALL_TESTS();
   }
+
+  // Run selected tests & benchmarks.
+  int rc = RUN_ALL_TESTS();
+  benchmark::RunSpecifiedBenchmarks();
+  return rc;
 }
 
 }  // namespace testing