diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-06-16 22:47:13 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-06-16 22:47:13 +0000 |
| commit | 682c89f7557eb53c7359b6cbf3670c05165f2419 (patch) | |
| tree | 3a0d849ba9e72f411fbcc0b1b8f1acd880647736 /test/gtest_environment_test.cc | |
| parent | 985a30360ce4824b65cb35ad55faa0d7c1ad1104 (diff) | |
| download | googletest-682c89f7557eb53c7359b6cbf3670c05165f2419.tar.gz googletest-682c89f7557eb53c7359b6cbf3670c05165f2419.tar.bz2 googletest-682c89f7557eb53c7359b6cbf3670c05165f2419.zip | |
Makes gtest report failures in ad hoc test assertions executed before RUN_ALL_TESTS().
Diffstat (limited to 'test/gtest_environment_test.cc')
| -rw-r--r-- | test/gtest_environment_test.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/gtest_environment_test.cc b/test/gtest_environment_test.cc index c9392614..94ea318b 100644 --- a/test/gtest_environment_test.cc +++ b/test/gtest_environment_test.cc @@ -35,6 +35,10 @@ #include <stdio.h> #include <gtest/gtest.h> +#define GTEST_IMPLEMENTATION_ 1 // Required for the next #include. +#include "src/gtest-internal-inl.h" +#undef GTEST_IMPLEMENTATION_ + namespace testing { GTEST_DECLARE_string_(filter); } @@ -123,6 +127,7 @@ int RunAllTests(MyEnvironment* env, FailureType failure) { env->Reset(); env->set_failure_in_set_up(failure); test_was_run = false; + testing::internal::GetUnitTestImpl()->ClearAdHocTestResult(); return RUN_ALL_TESTS(); } |