summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-07-08 21:44:59 (GMT)
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-07-08 21:44:59 (GMT)
commit5e4214cee4f74d25f1d89dc1c95dc247ed20b6c8 (patch)
tree4191968879b2cf55f8f23b54479ac893336b2247 /test
parent682c89f7557eb53c7359b6cbf3670c05165f2419 (diff)
downloadgoogletest-5e4214cee4f74d25f1d89dc1c95dc247ed20b6c8.zip
googletest-5e4214cee4f74d25f1d89dc1c95dc247ed20b6c8.tar.gz
googletest-5e4214cee4f74d25f1d89dc1c95dc247ed20b6c8.tar.bz2
Makes gtest_break_on_failure_unittest work on minGW (by vladl); improves
the NULL-dereferencing hack to work with LLVM (by chandlerc).
Diffstat (limited to 'test')
-rw-r--r--test/gtest_break_on_failure_unittest_.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gtest_break_on_failure_unittest_.cc b/test/gtest_break_on_failure_unittest_.cc
index d28d1d3..6779c90 100644
--- a/test/gtest_break_on_failure_unittest_.cc
+++ b/test/gtest_break_on_failure_unittest_.cc
@@ -69,7 +69,7 @@ int main(int argc, char **argv) {
// a general protection fault (segment violation).
SetErrorMode(SEM_NOGPFAULTERRORBOX | SEM_FAILCRITICALERRORS);
-#if !GTEST_OS_WINDOWS_MOBILE
+#if GTEST_HAS_SEH && !GTEST_OS_WINDOWS_MOBILE
// The default unhandled exception filter does not always exit
// with the exception code as exit code - for example it exits with
// 0 for EXCEPTION_ACCESS_VIOLATION and 1 for EXCEPTION_BREAKPOINT