Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
f487e951
Commit
f487e951
authored
Jul 27, 2015
by
kosak
Browse files
Inject the name of the Init function using a macro.
parent
4188ec35
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+4
-0
test/gtest-port_test.cc
test/gtest-port_test.cc
+5
-3
No files found.
include/gtest/internal/gtest-port.h
View file @
f487e951
...
...
@@ -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.
...
...
test/gtest-port_test.cc
View file @
f487e951
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment