Makes gtest report failures in ad hoc test assertions executed before RUN_ALL_TESTS().

2 files changed, 9 insertions, 3 deletions

diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h
index 9e63aed7..c5608c99 100644
--- a/src/gtest-internal-inl.h
+++ b/src/gtest-internal-inl.h
@@ -754,9 +754,13 @@ class GTEST_API_ UnitTestImpl {
   // doesn't apply there.)
   int RunAllTests();
 
-  // Clears the results of all tests, including the ad hoc test.
-  void ClearResult() {
+  // Clears the results of all tests, except the ad hoc tests.
+  void ClearNonAdHocTestResult() {
     ForEach(test_cases_, TestCase::ClearTestCaseResult);
+  }
+
+  // Clears the results of ad-hoc test assertions.
+  void ClearAdHocTestResult() {
     ad_hoc_test_result_.Clear();
   }
 
diff --git a/src/gtest.cc b/src/gtest.cc
index e136a18b..cb2c34c7 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -3999,7 +3999,9 @@ int UnitTestImpl::RunAllTests() {
   // Repeats forever if the repeat count is negative.
   const bool forever = repeat < 0;
   for (int i = 0; forever || i != repeat; i++) {
-    ClearResult();
+    // We want to preserve failures generated by ad-hoc test
+    // assertions executed before RUN_ALL_TESTS().
+    ClearNonAdHocTestResult();
 
     const TimeInMillis start = GetTimeInMillis();