From e5378b204849dcdaca429e3ac2a57bedfd681877 Mon Sep 17 00:00:00 2001 From: Cristian Klein Date: Wed, 28 Oct 2020 22:25:56 +0100 Subject: [PATCH] [auto-clear] Make test more future-proof with GoogleTest --- libgnucash/app-utils/test/test-autoclear.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libgnucash/app-utils/test/test-autoclear.cpp b/libgnucash/app-utils/test/test-autoclear.cpp index f00b809765..b99b5d655e 100644 --- a/libgnucash/app-utils/test/test-autoclear.cpp +++ b/libgnucash/app-utils/test/test-autoclear.cpp @@ -156,11 +156,15 @@ TEST_P(AutoClearTest, DoesAutoClear) { } } +#ifndef INSTANTIATE_TEST_SUITE_P // Silence "no previous declaration for" which is treated as error, due to -Werror testing::internal::ParamGenerator gtest_InstantiationAutoClearTestAutoClearTest_EvalGenerator_(); std::string gtest_InstantiationAutoClearTestAutoClearTest_EvalGenerateName_(const testing::TestParamInfo&); INSTANTIATE_TEST_CASE_P( +#else // INSTANTIATE_TEST_SUITE_P +INSTANTIATE_TEST_SUITE_P( +#endif // INSTANTIATE_TEST_SUITE_P InstantiationAutoClearTest, AutoClearTest, ::testing::Values(