Repository: mesos Updated Branches: refs/heads/master 11de04c1b -> c0293a6f7
Initialized tests with Google Mock initialization. Switched over to explicitly using Google Mock to initialize the test suite. This enables Google Mock option flags so that --gmock_verbose will be supported. Review: https://reviews.apache.org/r/62443/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c0293a6f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c0293a6f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c0293a6f Branch: refs/heads/master Commit: c0293a6f7d457a595a3763662e3a9740db31859b Parents: 11de04c Author: James Peach <jpe...@apache.org> Authored: Wed Sep 20 14:38:27 2017 -0700 Committer: Greg Mann <gregorywm...@gmail.com> Committed: Wed Sep 20 15:29:02 2017 -0700 ---------------------------------------------------------------------- src/tests/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c0293a6f/src/tests/main.cpp ---------------------------------------------------------------------- diff --git a/src/tests/main.cpp b/src/tests/main.cpp index cd30cac..f945ac9 100644 --- a/src/tests/main.cpp +++ b/src/tests/main.cpp @@ -90,7 +90,7 @@ int main(int argc, char** argv) if (flags.help) { cout << flags.usage() << endl; - testing::InitGoogleTest(&argc, argv); // Get usage from gtest too. + testing::InitGoogleMock(&argc, argv); // Get usage from gtest too. return EXIT_SUCCESS; } @@ -150,7 +150,7 @@ int main(int argc, char** argv) } // Initialize gmock/gtest. - testing::InitGoogleTest(&argc, argv); + testing::InitGoogleMock(&argc, argv); testing::FLAGS_gtest_death_test_style = "threadsafe"; LOG(INFO) << "Source directory: " << flags.source_dir;
