diff options
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/test_suite.cc | 32 | ||||
| -rw-r--r-- | base/test/test_suite.h | 3 |
2 files changed, 11 insertions, 24 deletions
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc index dba5063..75e9ff5 100644 --- a/base/test/test_suite.cc +++ b/base/test/test_suite.cc @@ -70,7 +70,6 @@ class TestClientInitializer : public testing::EmptyTestEventListener { } // namespace const char TestSuite::kStrictFailureHandling[] = "strict_failure_handling"; -const char TestSuite::kSilent[] = "silent"; TestSuite::TestSuite(int argc, char** argv) : initialized_command_line_(false) { PreInitialize(argc, argv, true); @@ -178,13 +177,6 @@ int TestSuite::Run() { CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kTestChildProcess); - bool silent = CommandLine::ForCurrentProcess()->HasSwitch(kSilent); - if (silent) { - testing::TestEventListeners& listeners = - testing::UnitTest::GetInstance()->listeners(); - delete listeners.Release(listeners.default_result_printer()); - } - // Check to see if we are being run as a client process. if (!client_func.empty()) return multi_process_function_list::InvokeChildProcessTest(client_func); @@ -194,20 +186,18 @@ int TestSuite::Run() { if (result != 0 && GetTestCount(&TestSuite::NonIgnoredFailures) == 0) result = 0; - if (!silent) { - // Display the number of flaky tests. - int flaky_count = GetTestCount(&TestSuite::IsMarkedFlaky); - if (flaky_count) { - printf(" YOU HAVE %d FLAKY %s\n\n", flaky_count, - flaky_count == 1 ? "TEST" : "TESTS"); - } + // Display the number of flaky tests. + int flaky_count = GetTestCount(&TestSuite::IsMarkedFlaky); + if (flaky_count) { + printf(" YOU HAVE %d FLAKY %s\n\n", flaky_count, + flaky_count == 1 ? "TEST" : "TESTS"); + } - // Display the number of tests with ignored failures (FAILS). - int failing_count = GetTestCount(&TestSuite::IsMarkedFailing); - if (failing_count) { - printf(" YOU HAVE %d %s with ignored failures (FAILS prefix)\n\n", - failing_count, failing_count == 1 ? "test" : "tests"); - } + // Display the number of tests with ignored failures (FAILS). + int failing_count = GetTestCount(&TestSuite::IsMarkedFailing); + if (failing_count) { + printf(" YOU HAVE %d %s with ignored failures (FAILS prefix)\n\n", + failing_count, failing_count == 1 ? "test" : "tests"); } #if defined(OS_MACOSX) diff --git a/base/test/test_suite.h b/base/test/test_suite.h index 889e55f..2b0e9ce 100644 --- a/base/test/test_suite.h +++ b/base/test/test_suite.h @@ -59,9 +59,6 @@ class TestSuite { // process exit code. static const char kStrictFailureHandling[]; - // A command-line flag that silences all gtest output. - static const char kSilent[]; - protected: // This constructor is only accessible to specialized test suite // implementations which need to control the creation of an AtExitManager |