[Orxonox-commit 4407] r9078 - code/branches/testing/src/external/gtest/src

[landauf at orxonox.net]

Author: landauf
Date: 2012-04-01 21:05:30 +0200 (Sun, 01 Apr 2012)
New Revision: 9078

Modified:
   code/branches/testing/src/external/gtest/src/gtest.cc
Log:
small fix in google-test that seems to prevent a windows dialog from popping-up during death tests

Modified: code/branches/testing/src/external/gtest/src/gtest.cc
===================================================================
--- code/branches/testing/src/external/gtest/src/gtest.cc	2012-04-01 16:48:06 UTC (rev 9077)
+++ code/branches/testing/src/external/gtest/src/gtest.cc	2012-04-01 19:05:30 UTC (rev 9078)
@@ -3824,7 +3824,7 @@
   // used for the duration of the program.
   impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions));
 
-#if GTEST_HAS_SEH
+#if GTEST_HAS_SEH || GTEST_OS_WINDOWS_MINGW
   const bool in_death_test_child_process =
       internal::GTEST_FLAG(internal_run_death_test).length() > 0;