aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2015-07-28 00:24:28 +0000
committerkosak <kosak@google.com>2015-07-28 00:24:28 +0000
commit01db9d469ba113cee5040ba65bb98b2cb04c8583 (patch)
tree9324439f7c85dcf45b417ade432232e1134454f2
parente83085aeb11d2eb07cf5e75a8b8da3587ec28445 (diff)
downloadgoogletest-01db9d469ba113cee5040ba65bb98b2cb04c8583.tar.gz
googletest-01db9d469ba113cee5040ba65bb98b2cb04c8583.tar.bz2
googletest-01db9d469ba113cee5040ba65bb98b2cb04c8583.zip
Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_
-rw-r--r--test/gmock_test.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/gmock_test.cc b/test/gmock_test.cc
index baba7178..ae5e22c8 100644
--- a/test/gmock_test.cc
+++ b/test/gmock_test.cc
@@ -37,6 +37,9 @@
#include <string>
#include "gtest/gtest.h"
+#include "gtest/internal/custom/gtest.h"
+
+#if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
using testing::GMOCK_FLAG(verbose);
using testing::InitGoogleMock;
@@ -208,6 +211,8 @@ TEST(WideInitGoogleMockTest, ParsesGoogleMockFlagAndUnrecognizedFlag) {
TestInitGoogleMock(argv, new_argv, "error");
}
+#endif // !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_)
+
// Makes sure Google Mock flags can be accessed in code.
TEST(FlagTest, IsAccessibleInCode) {
bool dummy = testing::GMOCK_FLAG(catch_leaked_mocks) &&