diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-03-28 23:33:03 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-03-29 17:56:55 +0200 |
| commit | 463b515efa427bb031e6b83047050084f94008a4 (patch) | |
| tree | eace270f599ab41f93ff5db6ae60a138ef68da75 /searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp | |
| parent | 49bbb07870e221e6c38b2b7955985c5f3f5518ed (diff) | |
Handle newer gtest versions where the legacy API is deprecated.
Diffstat (limited to 'searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp')
| -rw-r--r-- | searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp b/searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp index 31af5945337..3ea2ce73700 100644 --- a/searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp +++ b/searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp @@ -221,7 +221,11 @@ TEST_P(IntegerCompactionTest, compact) test_enum_store_compaction(); } +#ifdef INSTANTIATE_TEST_SUITE_P +INSTANTIATE_TEST_SUITE_P(IntegerCompactionTestSet, IntegerCompactionTest, ::testing::Values(CollectionType::SINGLE, CollectionType::ARRAY, CollectionType::WSET)); +#else INSTANTIATE_TEST_CASE_P(IntegerCompactionTestSet, IntegerCompactionTest, ::testing::Values(CollectionType::SINGLE, CollectionType::ARRAY, CollectionType::WSET)); +#endif using StringCompactionTest = CompactionTest<StringAttribute>; @@ -230,6 +234,10 @@ TEST_P(StringCompactionTest, compact) test_enum_store_compaction(); } +#ifdef INSTANTIATE_TEST_SUITE_P +INSTANTIATE_TEST_SUITE_P(StringCompactionTestSet, StringCompactionTest, ::testing::Values(CollectionType::SINGLE, CollectionType::ARRAY, CollectionType::WSET)); +#else INSTANTIATE_TEST_CASE_P(StringCompactionTestSet, StringCompactionTest, ::testing::Values(CollectionType::SINGLE, CollectionType::ARRAY, CollectionType::WSET)); +#endif GTEST_MAIN_RUN_ALL_TESTS() |