diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-01-14 05:36:32 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-01-14 05:36:32 +0000 |
| commit | d14aaed74b2a8a1222d60d8fa3afcfc93a21c321 (patch) | |
| tree | cf118668b44f1b3914c22003d763bb58504a37eb /test/gmock_link_test.h | |
| parent | 6953a725fc2151eff18078f8315d92811cd4d90e (diff) | |
| download | googletest-d14aaed74b2a8a1222d60d8fa3afcfc93a21c321.tar.gz googletest-d14aaed74b2a8a1222d60d8fa3afcfc93a21c321.tar.bz2 googletest-d14aaed74b2a8a1222d60d8fa3afcfc93a21c321.zip | |
Enables regex matchers on all platforms.
Diffstat (limited to 'test/gmock_link_test.h')
| -rw-r--r-- | test/gmock_link_test.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/gmock_link_test.h b/test/gmock_link_test.h index d9635907..aa9aab3a 100644 --- a/test/gmock_link_test.h +++ b/test/gmock_link_test.h @@ -185,10 +185,8 @@ using testing::SetErrnoAndReturn; using testing::Throw; #endif -#if GMOCK_HAS_REGEX using testing::ContainsRegex; using testing::MatchesRegex; -#endif class Interface { public: @@ -547,7 +545,6 @@ TEST(LinkTest, TestMatchersFloatingPoint) { .WillByDefault(Return()); } -#if GMOCK_HAS_REGEX // Tests the linkage of the ContainsRegex matcher. TEST(LinkTest, TestMatcherContainsRegex) { Mock mock; @@ -561,7 +558,6 @@ TEST(LinkTest, TestMatcherMatchesRegex) { ON_CALL(mock, VoidFromString(MatchesRegex(".*"))).WillByDefault(Return()); } -#endif // GMOCK_HAS_REGEX // Tests the linkage of the StartsWith, EndsWith, and HasSubstr matchers. TEST(LinkTest, TestMatchersSubstrings) { |