summaryrefslogtreecommitdiff
path: root/include/gtest/gtest.h
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-04-07 21:03:22 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-04-07 21:03:22 +0000
commit1b171100b3341c01fb377f8202d9eaccbeec1f55 (patch)
tree78dba5344afb37f56eb716fbe75786aab1eb52d9 /include/gtest/gtest.h
parent04b0cec06369da88620647d3a616a28539570b22 (diff)
downloadgtest-1b171100b3341c01fb377f8202d9eaccbeec1f55.tar.gz
gtest-1b171100b3341c01fb377f8202d9eaccbeec1f55.tar.bz2
gtest-1b171100b3341c01fb377f8202d9eaccbeec1f55.tar.xz
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).
git-svn-id: http://googletest.googlecode.com/svn/trunk@236 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include/gtest/gtest.h')
-rw-r--r--include/gtest/gtest.h7
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