summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-07-14 20:26:09 +0000
committerkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-07-14 20:26:09 +0000
commite3793aadae9e7f73b06d8d6cff3405776eed5223 (patch)
tree618c6d3843f82f23c50dc538adaa6a00a38573dc
parentf195612f91f42d4dd2b4ec552b804fd37a36523c (diff)
downloadgoogletest-e3793aadae9e7f73b06d8d6cff3405776eed5223.tar.gz
Control death test with an #ifdef guard.
git-svn-id: http://googletest.googlecode.com/svn/trunk@715 861a406c-534a-0410-8894-cb66d6ee9925
-rw-r--r--test/gtest-death-test_test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc
index d62cf6e..bb4a3d1 100644
--- a/test/gtest-death-test_test.cc
+++ b/test/gtest-death-test_test.cc
@@ -510,8 +510,12 @@ TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) {
# endif // GTEST_HAS_GLOBAL_STRING
+# if !GTEST_USES_PCRE
+
const ::std::string regex_std_str(regex_c_str);
EXPECT_DEATH(GlobalFunction(), regex_std_str);
+
+# endif // !GTEST_USES_PCRE
}
// Tests that a non-void function can be used in a death test.