summaryrefslogtreecommitdiff
path: root/src/gtest-internal-inl.h
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-06-16 22:47:13 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-06-16 22:47:13 +0000
commit63b4f32b442c767ebe54ec66aed8b65d9c0b6f5e (patch)
tree3a0d849ba9e72f411fbcc0b1b8f1acd880647736 /src/gtest-internal-inl.h
parent9748de060f19f81fd9dd7ccabf2be4bb624237b5 (diff)
downloadgtest-63b4f32b442c767ebe54ec66aed8b65d9c0b6f5e.tar.gz
gtest-63b4f32b442c767ebe54ec66aed8b65d9c0b6f5e.tar.bz2
gtest-63b4f32b442c767ebe54ec66aed8b65d9c0b6f5e.tar.xz
Makes gtest report failures in ad hoc test assertions executed before RUN_ALL_TESTS().
git-svn-id: http://googletest.googlecode.com/svn/trunk@441 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src/gtest-internal-inl.h')
-rw-r--r--src/gtest-internal-inl.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h
index 9e63aed..c5608c9 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();
}