From 8e86f67261649621baf39e8c4368ae224c2193f6 Mon Sep 17 00:00:00 2001 From: durandal Date: Thu, 15 Nov 2018 16:09:09 -0500 Subject: Googletest export Move the Matcher interface to googletest so I can use it to extend death test regex matching in a subsequent change. PiperOrigin-RevId: 221675910 --- googletest/test/googletest-death-test-test.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'googletest/test/googletest-death-test-test.cc') diff --git a/googletest/test/googletest-death-test-test.cc b/googletest/test/googletest-death-test-test.cc index a81702c0..f92bb1a6 100644 --- a/googletest/test/googletest-death-test-test.cc +++ b/googletest/test/googletest-death-test-test.cc @@ -499,6 +499,10 @@ TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) { const ::string regex_str(regex_c_str); EXPECT_DEATH(GlobalFunction(), regex_str); + // This one is tricky; a temporary pointer into another temporary. Reference + // lifetime extension of the pointer is not sufficient. + EXPECT_DEATH(GlobalFunction(), ::string(regex_c_str).c_str()); + # endif // GTEST_HAS_GLOBAL_STRING # if !GTEST_USES_PCRE @@ -506,6 +510,10 @@ TEST_F(TestForDeathTest, AcceptsAnythingConvertibleToRE) { const ::std::string regex_std_str(regex_c_str); EXPECT_DEATH(GlobalFunction(), regex_std_str); + // This one is tricky; a temporary pointer into another temporary. Reference + // lifetime extension of the pointer is not sufficient. + EXPECT_DEATH(GlobalFunction(), ::std::string(regex_c_str).c_str()); + # endif // !GTEST_USES_PCRE } -- cgit v1.2.3