diff options
| author | Tanzinul Islam <tanzislam@users.noreply.github.com> | 2018-03-05 02:25:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 02:25:59 +0000 |
| commit | a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (patch) | |
| tree | c6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/test/gmock_test.cc | |
| parent | 4ba3803f936a2f432e60841bc9358ea2f3a951eb (diff) | |
| parent | 6c73adfc03e277f55cb1e4947b3a5e6c5ff4fe46 (diff) | |
| download | googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.tar.gz googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.tar.bz2 googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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]); |