Inject the name of the Init function using a macro.

pull/496/merge
kosak 10 years ago
parent 4188ec3529
commit f487e9510b
  1. 4
      include/gtest/internal/gtest-port.h
  2. 8
      test/gtest-port_test.cc

@ -290,6 +290,10 @@
# define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/"
#endif // !defined(GTEST_DEV_EMAIL_)
#if !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
# define GTEST_INIT_GOOGLE_TEST_NAME_ "testing::InitGoogleTest"
#endif // !defined(GTEST_INIT_GOOGLE_TEST_NAME_)
// Determines the version of gcc that is used to compile this.
#ifdef __GNUC__
// 40302 means version 4.3.2.

@ -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

Loading…
Cancel
Save