diff options
author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-02-12 17:35:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-12 17:35:07 +0000 |
commit | f11a8f9131584cf4009eca8af8a66e920c1b7391 (patch) | |
tree | 06cf7b6488c5980a90bcc355f186047f8b5a16c0 /googlemock/test/gmock_test.cc | |
parent | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (diff) | |
parent | 15392f1a38fa0b8c3f13a9732e94b209069efa1c (diff) | |
download | googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.tar.gz googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.tar.bz2 googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.zip |
Merge branch 'master' into fix-argc
Diffstat (limited to 'googlemock/test/gmock_test.cc')
-rw-r--r-- | googlemock/test/gmock_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googlemock/test/gmock_test.cc b/googlemock/test/gmock_test.cc index 28995345..70075679 100644 --- a/googlemock/test/gmock_test.cc +++ b/googlemock/test/gmock_test.cc @@ -37,6 +37,7 @@ #include <string> #include "gtest/gtest.h" +#include "gtest/internal/custom/gtest.h" #if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) @@ -51,9 +52,9 @@ void TestInitGoogleMock(const Char* (&argv)[M], const Char* (&new_argv)[N], const ::std::string& expected_gmock_verbose) { const ::std::string old_verbose = GMOCK_FLAG(verbose); - int argc = M; + int argc = M - 1; InitGoogleMock(&argc, const_cast<Char**>(argv)); - ASSERT_EQ(N, argc) << "The new argv has wrong number of elements."; + ASSERT_EQ(N - 1, argc) << "The new argv has wrong number of elements."; for (int i = 0; i < N; i++) { EXPECT_STREQ(new_argv[i], argv[i]); |