diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-04-07 21:03:22 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-04-07 21:03:22 (GMT) |
| commit | c12f63214e9b7761d27e68353e4aaf1761c9cf88 (patch) | |
| tree | 78dba5344afb37f56eb716fbe75786aab1eb52d9 /include/gtest/gtest.h | |
| parent | 0da92aaf7f696ebfa2374247ae9010dacbc057fc (diff) | |
| download | googletest-c12f63214e9b7761d27e68353e4aaf1761c9cf88.zip googletest-c12f63214e9b7761d27e68353e4aaf1761c9cf88.tar.gz googletest-c12f63214e9b7761d27e68353e4aaf1761c9cf88.tar.bz2 | |
Adds sample4_unittest to scons (by Vlad Losev); adds logic for getting the thread count on Mac (by Vlad Losev); adds HasFailure() and HasNonfatalFailure() (by Zhanyong Wan).
Diffstat (limited to 'include/gtest/gtest.h')
| -rw-r--r-- | include/gtest/gtest.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 6d87e03..26d76b2 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -272,6 +272,13 @@ class Test { // Returns true iff the current test has a fatal failure. static bool HasFatalFailure(); + // Returns true iff the current test has a non-fatal failure. + static bool HasNonfatalFailure(); + + // Returns true iff the current test has a (either fatal or + // non-fatal) failure. + static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); } + // Logs a property for the current test. Only the last value for a given // key is remembered. // These are public static so they can be called from utility functions |