diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-26 12:22:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 12:22:48 -0500 |
| commit | 718fd88d8f145c63b8cc134cf8fed92743cc112f (patch) | |
| tree | 2a2f28e60798824956dc46fb7c89e1e35ee2a8de /googlemock/test/gmock_test.cc | |
| parent | cb7271697bca56802db773f1b9a92fdaed5b7eee (diff) | |
| parent | 92c93802e13e84f4d916f45dd99417cdeb38841b (diff) | |
| download | googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.tar.gz googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.tar.bz2 googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.zip | |
Merge pull request #1429 from gennadiycivil/master
Code merges
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]); |