summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorJun Jie <siliconearth@gmail.com>2020-07-02 05:33:56 (GMT)
committerJun Jie <siliconearth@gmail.com>2020-07-02 05:33:56 (GMT)
commit5c0ef1cb84b589b8dbd986dfa5ffcdaeafc00358 (patch)
tree9c181c33f7e0d9a8c4bf975de64c875c60e4305e /googletest
parentaee0f9d9b5b87796ee8a0ab26b7587ec30e8858e (diff)
downloadgoogletest-5c0ef1cb84b589b8dbd986dfa5ffcdaeafc00358.zip
googletest-5c0ef1cb84b589b8dbd986dfa5ffcdaeafc00358.tar.gz
googletest-5c0ef1cb84b589b8dbd986dfa5ffcdaeafc00358.tar.bz2
Fix test failing when simple regex is usedrefs/pull/2920/head
Test MatcherDeathTest.DoesNotBreakBareRegexMatching fails when googletest uses simple regex instead of posix regex. This partially fixes #2687
Diffstat (limited to 'googletest')
-rw-r--r--googletest/test/googletest-death-test-test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/googletest/test/googletest-death-test-test.cc b/googletest/test/googletest-death-test-test.cc
index b0dda27..1bb5bb7 100644
--- a/googletest/test/googletest-death-test-test.cc
+++ b/googletest/test/googletest-death-test-test.cc
@@ -1376,7 +1376,11 @@ void DieWithMessage(const char* message) {
TEST(MatcherDeathTest, DoesNotBreakBareRegexMatching) {
// googletest tests this, of course; here we ensure that including googlemock
// has not broken it.
+#if GTEST_USES_POSIX_RE
EXPECT_DEATH(DieWithMessage("O, I die, Horatio."), "I d[aeiou]e");
+#else
+ EXPECT_DEATH(DieWithMessage("O, I die, Horatio."), "I di?e");
+#endif
}
TEST(MatcherDeathTest, MonomorphicMatcherMatches) {