| Index: base/test/test_suite.cc
|
| diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
|
| index b0c7c2212f6d5de72bbc484781464d6fb0311b27..2ab5c36026c3482a6348e4a6ca45aa06ebd50996 100644
|
| --- a/base/test/test_suite.cc
|
| +++ b/base/test/test_suite.cc
|
| @@ -128,11 +128,6 @@ bool TestSuite::IsMarkedFlaky(const testing::TestInfo& test) {
|
| }
|
|
|
| // static
|
| -bool TestSuite::IsMarkedFailing(const testing::TestInfo& test) {
|
| - return strncmp(test.name(), "FAILS_", 6) == 0;
|
| -}
|
| -
|
| -// static
|
| bool TestSuite::IsMarkedMaybe(const testing::TestInfo& test) {
|
| return strncmp(test.name(), "MAYBE_", 6) == 0;
|
| }
|
| @@ -141,7 +136,7 @@ bool TestSuite::IsMarkedMaybe(const testing::TestInfo& test) {
|
| bool TestSuite::ShouldIgnoreFailure(const testing::TestInfo& test) {
|
| if (CommandLine::ForCurrentProcess()->HasSwitch(kStrictFailureHandling))
|
| return false;
|
| - return IsMarkedFlaky(test) || IsMarkedFailing(test);
|
| + return IsMarkedFlaky(test);
|
| }
|
|
|
| // static
|
| @@ -209,13 +204,6 @@ int TestSuite::Run() {
|
| 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");
|
| - }
|
| -
|
| #if defined(OS_MACOSX)
|
| // This MUST happen before Shutdown() since Shutdown() tears down
|
| // objects (such as NotificationService::current()) that Cocoa
|
|
|