summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386>2015-07-28 00:24:28 +0000
committerkosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386>2015-07-28 00:24:28 +0000
commitd5056fd39c9122147aee328bb0bd1aac193a4de4 (patch)
tree9324439f7c85dcf45b417ade432232e1134454f2
parent5e80cdf82725bcef691d9a48fe037d4d203a1e35 (diff)
downloadgooglemock-d5056fd39c9122147aee328bb0bd1aac193a4de4.tar.gz
Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_
git-svn-id: http://googlemock.googlecode.com/svn/trunk@564 8415998a-534a-0410-bf83-d39667b30386
-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 baba717..ae5e22c 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) &&