summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-07-27 21:18:24 +0000
committerkosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925>2015-07-27 21:18:24 +0000
commit6e723bfbe3d2adf145efda50120d651e829c0dd2 (patch)
treed2caa162bfa728c2348d8ba7309a57bfc5e31836 /test
parent4fbd3a9e0eb0f70911de4f67ce94282bc6417bc4 (diff)
downloadgoogletest-6e723bfbe3d2adf145efda50120d651e829c0dd2.tar.gz
Inject the name of the Init function using a macro.
git-svn-id: http://googletest.googlecode.com/svn/trunk@740 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
-rw-r--r--test/gtest-port_test.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/gtest-port_test.cc b/test/gtest-port_test.cc
index 1441880..d17bad0 100644
--- a/test/gtest-port_test.cc
+++ b/test/gtest-port_test.cc
@@ -382,15 +382,17 @@ TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) {
// the platform. The test will produce compiler errors in case of failure.
// For simplicity, we only cover the most important platforms here.
TEST(RegexEngineSelectionTest, SelectsCorrectRegexEngine) {
-#if GTEST_HAS_POSIX_RE
+#if !GTEST_USES_PCRE
+# if GTEST_HAS_POSIX_RE
EXPECT_TRUE(GTEST_USES_POSIX_RE);
-#else
+# else
EXPECT_TRUE(GTEST_USES_SIMPLE_RE);
-#endif
+# endif
+#endif // !GTEST_USES_PCRE
}
#if GTEST_USES_POSIX_RE