From 8db7e7dc391223116175642a764528b8f6e607ef Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Mon, 30 Oct 2017 23:55:51 -0400 Subject: [PATCH] =?UTF-8?q?test:=20Don=E2=80=99t=20hide=20--gtest=5F*=20ar?= =?UTF-8?q?guments=20from=20Chromium=E2=80=99s=20test=20runner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit testing::InitGoogleMock() and testing::InitGoogleTest() modify argc and argv, removing --gtest_* arguments that are processed. When building as a part of Chromium, this prevents these arguments from being visible to Chromium’s base::LaunchUnitTests() test runner. Only call these initialization functions when using gtest’s native RUN_ALL_TESTS() test runner. Change-Id: I8242e1047f90d1cd923518a5cb9bd2527201ad25 Reviewed-on: https://chromium-review.googlesource.com/746082 Reviewed-by: Leonard Mosescu --- test/gtest_main.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/test/gtest_main.cc b/test/gtest_main.cc index 6e082828..d8c2a904 100644 --- a/test/gtest_main.cc +++ b/test/gtest_main.cc @@ -33,15 +33,6 @@ int main(int argc, char* argv[]) { crashpad::test::InitializeMainArguments(argc, argv); - -#if defined(CRASHPAD_TEST_LAUNCHER_GMOCK) - testing::InitGoogleMock(&argc, argv); -#elif defined(CRASHPAD_TEST_LAUNCHER_GTEST) - testing::InitGoogleTest(&argc, argv); -#else // CRASHPAD_TEST_LAUNCHER_GTEST -#error #define CRASHPAD_TEST_LAUNCHER_GTEST or CRASHPAD_TEST_LAUNCHER_GMOCK -#endif // CRASHPAD_TEST_LAUNCHER_GTEST - testing::AddGlobalTestEnvironment( crashpad::test::DisabledTestGtestEnvironment::Get()); @@ -69,5 +60,13 @@ int main(int argc, char* argv[]) { #endif // CRASHPAD_IN_CHROMIUM +#if defined(CRASHPAD_TEST_LAUNCHER_GMOCK) + testing::InitGoogleMock(&argc, argv); +#elif defined(CRASHPAD_TEST_LAUNCHER_GTEST) + testing::InitGoogleTest(&argc, argv); +#else // CRASHPAD_TEST_LAUNCHER_GMOCK +#error #define CRASHPAD_TEST_LAUNCHER_GTEST or CRASHPAD_TEST_LAUNCHER_GMOCK +#endif // CRASHPAD_TEST_LAUNCHER_GMOCK + return RUN_ALL_TESTS(); }