diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-27 10:00:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 10:00:29 -0500 |
| commit | d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199 (patch) | |
| tree | fd25c57276fa42ec365f1ca05b4853ab459697e4 /googlemock/test/gmock_test.cc | |
| parent | 3498a1ac52deb83f30b8170c78bfba9dc6227198 (diff) | |
| parent | ac34e6c950925df7165e626becd3f9d64dcd584b (diff) | |
| download | googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.tar.gz googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.tar.bz2 googletest-d4f77c1e3a340b37f5bed5e1e4de7d741f1d1199.zip | |
Merge branch 'master' into win-libcxx2
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]); |