diff options
| author | Bernhard Bauer <sheepmaster@gmail.com> | 2018-03-12 18:15:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 18:15:35 +0000 |
| commit | fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d (patch) | |
| tree | 0718a372bf66172bf4d3415eca6eb5d1f96b41fa /googlemock/test/gmock_test.cc | |
| parent | 7b70413e0ca57b3e48d7655f342122f159f52b31 (diff) | |
| parent | abc6e943e0878af67b91fa8a646edf717195c80c (diff) | |
| download | googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.gz googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.bz2 googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.zip | |
Merge branch 'master' into upstream_188748737
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]); |