diff options
| author | Tom Hughes <tomhughes@google.com> | 2023-02-07 18:37:15 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-02-07 18:38:08 (GMT) |
| commit | 0570e2d930a185bbc375be70d9ad96836b955a4f (patch) | |
| tree | 371c11e7c50f3779724cb96f946369659e677352 /googlemock | |
| parent | ee33b34bec6f9ccb51d3df6a369a6eb8b267447e (diff) | |
| download | googletest-0570e2d930a185bbc375be70d9ad96836b955a4f.zip googletest-0570e2d930a185bbc375be70d9ad96836b955a4f.tar.gz googletest-0570e2d930a185bbc375be70d9ad96836b955a4f.tar.bz2 | |
Remove GTEST_USES_PCRE references
Nothing defines GTEST_USES_PCRE anymore. It was only meant for
internal use, so nothing public should be relying on it:
https://github.com/google/googletest/issues/2735#issuecomment-644849438.
Found when compiling with "-Wundef".
Fixes #2735.
PiperOrigin-RevId: 507823660
Change-Id: Ie19e576ff01dc3b16381338578ece92adccfc09b
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index 76c9ff7..487b6c3 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -1088,16 +1088,7 @@ TEST(UnexpectedCallTest, UnsatisfiedPrerequisites) { // Verifies that the failure message contains the two unsatisfied // pre-requisites but not the satisfied one. -#if GTEST_USES_PCRE - EXPECT_THAT( - r.message(), - ContainsRegex( - // PCRE has trouble using (.|\n) to match any character, but - // supports the (?s) prefix for using . to match any character. - "(?s)the following immediate pre-requisites are not satisfied:\n" - ".*: pre-requisite #0\n" - ".*: pre-requisite #1")); -#elif GTEST_USES_POSIX_RE +#if GTEST_USES_POSIX_RE EXPECT_THAT(r.message(), ContainsRegex( // POSIX RE doesn't understand the (?s) prefix, but has no @@ -1112,7 +1103,7 @@ TEST(UnexpectedCallTest, UnsatisfiedPrerequisites) { "the following immediate pre-requisites are not satisfied:")); EXPECT_THAT(r.message(), ContainsRegex(": pre-requisite #0")); EXPECT_THAT(r.message(), ContainsRegex(": pre-requisite #1")); -#endif // GTEST_USES_PCRE +#endif // GTEST_USES_POSIX_RE b.DoB(1); b.DoB(3); |