diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 804af4657b..23487384fa 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -2463,7 +2463,7 @@ void TestResult::Clear() { elapsed_time_ = 0; } -// Returns true off the test part was skipped. +// Returns true if the test part was skipped. static bool TestPartSkipped(const TestPartResult& result) { return result.skipped(); } @@ -3755,6 +3755,8 @@ void BriefUnitTestResultPrinter::OnTestPartResult( // If the test part succeeded, we don't need to do anything. case TestPartResult::kSuccess: return; + case TestPartResult::kSkip: + return; default: // Print failure message from the assertion // (e.g. expected this and got that). diff --git a/googletest/test/gtest_skip_check_output_test.py b/googletest/test/gtest_skip_check_output_test.py index b30a16504b..b09a2454d3 100755 --- a/googletest/test/gtest_skip_check_output_test.py +++ b/googletest/test/gtest_skip_check_output_test.py @@ -37,7 +37,7 @@ from googletest.test import gtest_test_utils -# Path to the gtest_skip_in_environment_setup_test binary +# Path to the gtest_skip_test binary EXE_PATH = gtest_test_utils.GetTestExecutablePath('gtest_skip_test') OUTPUT = gtest_test_utils.Subprocess([EXE_PATH]).output @@ -55,6 +55,17 @@ def testSkipEntireEnvironmentTest(self): ) self.assertNotIn('FAILED', OUTPUT) + def testSkipTestWithBriefFlag(self): + brief_output = gtest_test_utils.Subprocess([EXE_PATH, "--gtest_brief=1"]).output + self.assertNotIn('Skipped\nskipping single test\n', brief_output) + skip_fixture = 'Skipped\nskipping all tests for this fixture\n' + self.assertIsNone( + re.search(skip_fixture + '.*' + skip_fixture, brief_output, flags=re.DOTALL), + repr(brief_output), + ) + self.assertIn('SKIPPED', brief_output) + self.assertNotIn('FAILED', brief_output) + if __name__ == '__main__': gtest_test_utils.Main()