Update googletest to latest master
Local changes required:
-Added googletest tests to CI script.
-For merge conflicts, preferred upstream in all cases.
-Added in a -Wno-unused-parameters, and removed some "-pthread"'s to
clean up obnoxious compiler warnings about unused flags.
-Added rules_python to WORKSPACE to make googletest happy.
-Update *_CASE_P to *_SUITE_P
Merge commit '33cf340fc114ccb0573488547776b0a8966b8108' into HEAD
Change-Id: Ie0caf2e61afe569038a25380e1ed5f8b41595900
diff --git a/aos/events/logging/buffer_encoder_test.cc b/aos/events/logging/buffer_encoder_test.cc
index a9c2bbb..0687f83 100644
--- a/aos/events/logging/buffer_encoder_test.cc
+++ b/aos/events/logging/buffer_encoder_test.cc
@@ -93,7 +93,7 @@
ASSERT_EQ(dummy_decoder.Read(&*buffer.begin(), &*buffer.end()), 0);
}
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
Dummy, BufferEncoderTest,
::testing::Combine(::testing::Values([]() {
return std::make_unique<DummyEncoder>();
diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index 2b504f3..4b0f375 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -2325,14 +2325,14 @@
constexpr std::string_view kSplitConfigSha1(
"1020274679a8f8c15ea20a48e4a35dd59a435203e5f31a57e15355e5a6ee31f7");
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
All, MultinodeLoggerTest,
::testing::Values(Param{"multinode_pingpong_combined_config.json", true,
kCombinedConfigSha1},
Param{"multinode_pingpong_split_config.json", false,
kSplitConfigSha1}));
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
All, MultinodeLoggerDeathTest,
::testing::Values(Param{"multinode_pingpong_combined_config.json", true,
kCombinedConfigSha1},
diff --git a/aos/events/logging/lzma_encoder_test.cc b/aos/events/logging/lzma_encoder_test.cc
index 2a56740..63ed6c2 100644
--- a/aos/events/logging/lzma_encoder_test.cc
+++ b/aos/events/logging/lzma_encoder_test.cc
@@ -7,7 +7,7 @@
namespace aos::logger::testing {
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
Lzma, BufferEncoderTest,
::testing::Combine(::testing::Values([]() {
return std::make_unique<LzmaEncoder>(2);
diff --git a/aos/events/shm_event_loop_test.cc b/aos/events/shm_event_loop_test.cc
index 2a2b706..5524597 100644
--- a/aos/events/shm_event_loop_test.cc
+++ b/aos/events/shm_event_loop_test.cc
@@ -77,10 +77,10 @@
::testing::Values(DoTimingReports::kYes, DoTimingReports::kNo));
}
-INSTANTIATE_TEST_CASE_P(ShmEventLoopCommonTest, AbstractEventLoopTest,
+INSTANTIATE_TEST_SUITE_P(ShmEventLoopCommonTest, AbstractEventLoopTest,
CommonParameters());
-INSTANTIATE_TEST_CASE_P(ShmEventLoopCommonDeathTest, AbstractEventLoopDeathTest,
+INSTANTIATE_TEST_SUITE_P(ShmEventLoopCommonDeathTest, AbstractEventLoopDeathTest,
CommonParameters());
} // namespace
@@ -321,13 +321,13 @@
// TODO(austin): Test that missing a deadline with a timer recovers as expected.
-INSTANTIATE_TEST_CASE_P(ShmEventLoopCopyTest, ShmEventLoopTest,
+INSTANTIATE_TEST_SUITE_P(ShmEventLoopCopyTest, ShmEventLoopTest,
::testing::Values(ReadMethod::COPY));
-INSTANTIATE_TEST_CASE_P(ShmEventLoopPinTest, ShmEventLoopTest,
+INSTANTIATE_TEST_SUITE_P(ShmEventLoopPinTest, ShmEventLoopTest,
::testing::Values(ReadMethod::PIN));
-INSTANTIATE_TEST_CASE_P(ShmEventLoopCopyDeathTest, ShmEventLoopDeathTest,
+INSTANTIATE_TEST_SUITE_P(ShmEventLoopCopyDeathTest, ShmEventLoopDeathTest,
::testing::Values(ReadMethod::COPY));
-INSTANTIATE_TEST_CASE_P(ShmEventLoopPinDeathTest, ShmEventLoopDeathTest,
+INSTANTIATE_TEST_SUITE_P(ShmEventLoopPinDeathTest, ShmEventLoopDeathTest,
::testing::Values(ReadMethod::PIN));
} // namespace testing
diff --git a/aos/events/simulated_event_loop_test.cc b/aos/events/simulated_event_loop_test.cc
index 34e10ca..ca0060c 100644
--- a/aos/events/simulated_event_loop_test.cc
+++ b/aos/events/simulated_event_loop_test.cc
@@ -71,10 +71,10 @@
::testing::Values(DoTimingReports::kYes, DoTimingReports::kNo));
}
-INSTANTIATE_TEST_CASE_P(SimulatedEventLoopCommonTest, AbstractEventLoopTest,
+INSTANTIATE_TEST_SUITE_P(SimulatedEventLoopCommonTest, AbstractEventLoopTest,
CommonParameters());
-INSTANTIATE_TEST_CASE_P(SimulatedEventLoopCommonDeathTest,
+INSTANTIATE_TEST_SUITE_P(SimulatedEventLoopCommonDeathTest,
AbstractEventLoopDeathTest, CommonParameters());
// Parameters to run all the tests with.
@@ -1552,7 +1552,7 @@
EXPECT_GE(pi1_server_statistics_count, 1u);
}
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
All, RemoteMessageSimulatedEventLoopTest,
::testing::Values(
Param{"multinode_pingpong_test_combined_config.json", true},
diff --git a/aos/network/message_bridge_test.cc b/aos/network/message_bridge_test.cc
index 7420579..3798943 100644
--- a/aos/network/message_bridge_test.cc
+++ b/aos/network/message_bridge_test.cc
@@ -1249,7 +1249,7 @@
pi1_remote_timestamp_thread.join();
}
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
MessageBridgeTests, MessageBridgeParameterizedTest,
::testing::Values(
Param{"message_bridge_test_combined_timestamps_common_config.json",
diff --git a/aos/testing/test_logging.cc b/aos/testing/test_logging.cc
index 6024a80..74e5790 100644
--- a/aos/testing/test_logging.cc
+++ b/aos/testing/test_logging.cc
@@ -105,6 +105,7 @@
failure_type = "ASSERT";
break;
case ::testing::TestPartResult::Type::kSuccess:
+ case ::testing::TestPartResult::Type::kSkip:
break;
}
log_do(ERROR, "%s: %d: gtest %s failure\n%s\n", result.file_name(),