Skip to content

Commit afa3518

Browse files
siyingfacebook-github-bot
siying
authored and
facebook-github-bot
committed
Revert "Update googletest from 1.8.1 to 1.10.0 (facebook#6808)" (facebook#6923)
Summary: This reverts commit 8d87e9c. Based on offline discussions, it's too early to upgrade to gtest 1.10, as it prevents some developers from using an older version of gtest to integrate to some other systems. Revert it for now. Pull Request resolved: facebook#6923 Reviewed By: pdillinger Differential Revision: D21864799 fbshipit-source-id: d0726b1ff649fc911b9378f1763316200bd363fc
1 parent 0f85d16 commit afa3518

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+17252
-10382
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ endif()
523523

524524
include_directories(${PROJECT_SOURCE_DIR})
525525
include_directories(${PROJECT_SOURCE_DIR}/include)
526-
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/gtest-1.10.0/fused-src)
526+
include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/gtest-1.8.1/fused-src)
527527
if(WITH_FOLLY_DISTRIBUTED_MUTEX)
528528
include_directories(${PROJECT_SOURCE_DIR}/third-party/folly)
529529
endif()
@@ -969,7 +969,7 @@ endif()
969969
CMAKE_DEPENDENT_OPTION(WITH_TESTS "build with tests" ON
970970
"CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
971971
if(WITH_TESTS)
972-
add_subdirectory(third-party/gtest-1.10.0/fused-src/gtest)
972+
add_subdirectory(third-party/gtest-1.8.1/fused-src/gtest)
973973
add_library(testharness STATIC
974974
test_util/testharness.cc)
975975
target_link_libraries(testharness gtest)

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ endif
334334

335335
export GTEST_THROW_ON_FAILURE=1
336336
export GTEST_HAS_EXCEPTIONS=1
337-
GTEST_DIR = third-party/gtest-1.10.0/fused-src
337+
GTEST_DIR = third-party/gtest-1.8.1/fused-src
338338
# AIX: pre-defined system headers are surrounded by an extern "C" block
339339
ifeq ($(PLATFORM), OS_AIX)
340340
PLATFORM_CCFLAGS += -I$(GTEST_DIR)

‎TARGETS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ ROCKSDB_PREPROCESSOR_FLAGS = [
7878
# Directories with files for #include
7979
"-I" + REPO_PATH + "include/",
8080
"-I" + REPO_PATH,
81-
"-I" + REPO_PATH + "third-party/gtest-1.10.0/fused-src/",
81+
"-I" + REPO_PATH + "third-party/gtest-1.8.1/fused-src/",
8282
]
8383

8484
ROCKSDB_ARCH_PREPROCESSOR_FLAGS = {
@@ -451,8 +451,8 @@ cpp_library(
451451

452452
cpp_library(
453453
name = "rocksdb_third_party_gtest",
454-
srcs = ["third-party/gtest-1.10.0/fused-src/gtest/gtest-all.cc"],
455-
headers = ["third-party/gtest-1.10.0/fused-src/gtest/gtest.h"],
454+
srcs = ["third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc"],
455+
headers = ["third-party/gtest-1.8.1/fused-src/gtest/gtest.h"],
456456
arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
457457
compiler_flags = ROCKSDB_COMPILER_FLAGS,
458458
os_deps = ROCKSDB_OS_DEPS,

‎cache/cache_test.cc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -758,13 +758,12 @@ TEST_P(CacheTest, GetCharge) {
758758
#ifdef SUPPORT_CLOCK_CACHE
759759
std::shared_ptr<Cache> (*new_clock_cache_func)(
760760
size_t, int, bool, CacheMetadataChargePolicy) = NewClockCache;
761-
INSTANTIATE_TEST_SUITE_P(CacheTestInstance, CacheTest,
762-
testing::Values(kLRU, kClock));
761+
INSTANTIATE_TEST_CASE_P(CacheTestInstance, CacheTest,
762+
testing::Values(kLRU, kClock));
763763
#else
764-
INSTANTIATE_TEST_SUITE_P(CacheTestInstance, CacheTest, testing::Values(kLRU));
764+
INSTANTIATE_TEST_CASE_P(CacheTestInstance, CacheTest, testing::Values(kLRU));
765765
#endif // SUPPORT_CLOCK_CACHE
766-
INSTANTIATE_TEST_SUITE_P(CacheTestInstance, LRUCacheTest,
767-
testing::Values(kLRU));
766+
INSTANTIATE_TEST_CASE_P(CacheTestInstance, LRUCacheTest, testing::Values(kLRU));
768767

769768
} // namespace ROCKSDB_NAMESPACE
770769

‎db/column_family_test.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -560,10 +560,10 @@ class ColumnFamilyTest
560560
ColumnFamilyTest() : ColumnFamilyTestBase(GetParam()) {}
561561
};
562562

563-
INSTANTIATE_TEST_SUITE_P(FormatDef, ColumnFamilyTest,
564-
testing::Values(test::kDefaultFormatVersion));
565-
INSTANTIATE_TEST_SUITE_P(FormatLatest, ColumnFamilyTest,
566-
testing::Values(test::kLatestFormatVersion));
563+
INSTANTIATE_TEST_CASE_P(FormatDef, ColumnFamilyTest,
564+
testing::Values(test::kDefaultFormatVersion));
565+
INSTANTIATE_TEST_CASE_P(FormatLatest, ColumnFamilyTest,
566+
testing::Values(test::kLatestFormatVersion));
567567

568568
TEST_P(ColumnFamilyTest, DontReuseColumnFamilyID) {
569569
for (int iter = 0; iter < 3; ++iter) {
@@ -749,11 +749,11 @@ TEST_P(FlushEmptyCFTestWithParam, FlushEmptyCFTest2) {
749749
db_options_.env = env_;
750750
}
751751

752-
INSTANTIATE_TEST_SUITE_P(
752+
INSTANTIATE_TEST_CASE_P(
753753
FormatDef, FlushEmptyCFTestWithParam,
754754
testing::Values(std::make_tuple(test::kDefaultFormatVersion, true),
755755
std::make_tuple(test::kDefaultFormatVersion, false)));
756-
INSTANTIATE_TEST_SUITE_P(
756+
INSTANTIATE_TEST_CASE_P(
757757
FormatLatest, FlushEmptyCFTestWithParam,
758758
testing::Values(std::make_tuple(test::kLatestFormatVersion, true),
759759
std::make_tuple(test::kLatestFormatVersion, false)));

‎db/compaction/compaction_iterator_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,8 @@ TEST_P(CompactionIteratorTest, RemoveSingleDeletionAtBottomLevel) {
697697
nullptr /*compaction_filter*/, true /*bottommost_level*/);
698698
}
699699

700-
INSTANTIATE_TEST_SUITE_P(CompactionIteratorTestInstance, CompactionIteratorTest,
701-
testing::Values(true, false));
700+
INSTANTIATE_TEST_CASE_P(CompactionIteratorTestInstance, CompactionIteratorTest,
701+
testing::Values(true, false));
702702

703703
// Tests how CompactionIterator work together with SnapshotChecker.
704704
class CompactionIteratorWithSnapshotCheckerTest

‎db/compaction/compaction_job_stats_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,8 +1017,8 @@ TEST_P(CompactionJobStatsTest, UniversalCompactionTest) {
10171017
ASSERT_EQ(stats_checker->NumberOfUnverifiedStats(), 0U);
10181018
}
10191019

1020-
INSTANTIATE_TEST_SUITE_P(CompactionJobStatsTest, CompactionJobStatsTest,
1021-
::testing::Values(1, 4));
1020+
INSTANTIATE_TEST_CASE_P(CompactionJobStatsTest, CompactionJobStatsTest,
1021+
::testing::Values(1, 4));
10221022
} // namespace ROCKSDB_NAMESPACE
10231023

10241024
int main(int argc, char** argv) {

‎db/comparator_db_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,10 @@ class ComparatorDBTest
314314
}
315315
};
316316

317-
INSTANTIATE_TEST_SUITE_P(FormatDef, ComparatorDBTest,
318-
testing::Values(test::kDefaultFormatVersion));
319-
INSTANTIATE_TEST_SUITE_P(FormatLatest, ComparatorDBTest,
320-
testing::Values(test::kLatestFormatVersion));
317+
INSTANTIATE_TEST_CASE_P(FormatDef, ComparatorDBTest,
318+
testing::Values(test::kDefaultFormatVersion));
319+
INSTANTIATE_TEST_CASE_P(FormatLatest, ComparatorDBTest,
320+
testing::Values(test::kLatestFormatVersion));
321321

322322
TEST_P(ComparatorDBTest, Bytewise) {
323323
for (int rand_seed = 301; rand_seed < 306; rand_seed++) {

‎db/db_basic_test.cc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,8 +1251,8 @@ TEST_P(DBMultiGetTestWithParam, MultiGetMultiCFSnapshot) {
12511251
}
12521252
}
12531253

1254-
INSTANTIATE_TEST_SUITE_P(DBMultiGetTestWithParam, DBMultiGetTestWithParam,
1255-
testing::Bool());
1254+
INSTANTIATE_TEST_CASE_P(DBMultiGetTestWithParam, DBMultiGetTestWithParam,
1255+
testing::Bool());
12561256

12571257
TEST_F(DBBasicTest, MultiGetBatchedSimpleUnsorted) {
12581258
do {
@@ -1773,8 +1773,8 @@ TEST_P(MultiGetPrefixExtractorTest, Batched) {
17731773
ASSERT_EQ(get_perf_context()->bloom_sst_hit_count, 4);
17741774
}
17751775

1776-
INSTANTIATE_TEST_SUITE_P(MultiGetPrefix, MultiGetPrefixExtractorTest,
1777-
::testing::Bool());
1776+
INSTANTIATE_TEST_CASE_P(MultiGetPrefix, MultiGetPrefixExtractorTest,
1777+
::testing::Bool());
17781778

17791779
#ifndef ROCKSDB_LITE
17801780
class DBMultiGetRowCacheTest : public DBBasicTest,
@@ -1865,8 +1865,8 @@ TEST_P(DBMultiGetRowCacheTest, MultiGetBatched) {
18651865
} while (ChangeCompactOptions());
18661866
}
18671867

1868-
INSTANTIATE_TEST_SUITE_P(DBMultiGetRowCacheTest, DBMultiGetRowCacheTest,
1869-
testing::Values(true, false));
1868+
INSTANTIATE_TEST_CASE_P(DBMultiGetRowCacheTest, DBMultiGetRowCacheTest,
1869+
testing::Values(true, false));
18701870

18711871
TEST_F(DBBasicTest, GetAllKeyVersions) {
18721872
Options options = CurrentOptions();
@@ -2630,16 +2630,16 @@ TEST_P(DBBasicTestWithParallelIO, MultiGetWithMissingFile) {
26302630
SyncPoint::GetInstance()->DisableProcessing();
26312631
}
26322632

2633-
INSTANTIATE_TEST_SUITE_P(
2634-
ParallelIO, DBBasicTestWithParallelIO,
2635-
// Params are as follows -
2636-
// Param 0 - Compressed cache enabled
2637-
// Param 1 - Uncompressed cache enabled
2638-
// Param 2 - Data compression enabled
2639-
// Param 3 - ReadOptions::fill_cache
2640-
// Param 4 - CompressionOptions::parallel_threads
2641-
::testing::Combine(::testing::Bool(), ::testing::Bool(), ::testing::Bool(),
2642-
::testing::Bool(), ::testing::Values(1, 4)));
2633+
INSTANTIATE_TEST_CASE_P(ParallelIO, DBBasicTestWithParallelIO,
2634+
// Params are as follows -
2635+
// Param 0 - Compressed cache enabled
2636+
// Param 1 - Uncompressed cache enabled
2637+
// Param 2 - Data compression enabled
2638+
// Param 3 - ReadOptions::fill_cache
2639+
// Param 4 - CompressionOptions::parallel_threads
2640+
::testing::Combine(::testing::Bool(), ::testing::Bool(),
2641+
::testing::Bool(), ::testing::Bool(),
2642+
::testing::Values(1, 4)));
26432643

26442644
// A test class for intercepting random reads and injecting artificial
26452645
// delays. Used for testing the deadline/timeout feature

‎db/db_bloom_filter_test.cc

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -504,23 +504,23 @@ TEST_P(DBBloomFilterTestWithParam, BloomFilter) {
504504
}
505505

506506
#ifndef ROCKSDB_VALGRIND_RUN
507-
INSTANTIATE_TEST_SUITE_P(
507+
INSTANTIATE_TEST_CASE_P(
508508
FormatDef, DBBloomFilterTestDefFormatVersion,
509509
::testing::Values(
510510
std::make_tuple(BFP::kDeprecatedBlock, false,
511511
test::kDefaultFormatVersion),
512512
std::make_tuple(BFP::kAuto, true, test::kDefaultFormatVersion),
513513
std::make_tuple(BFP::kAuto, false, test::kDefaultFormatVersion)));
514514

515-
INSTANTIATE_TEST_SUITE_P(
515+
INSTANTIATE_TEST_CASE_P(
516516
FormatDef, DBBloomFilterTestWithParam,
517517
::testing::Values(
518518
std::make_tuple(BFP::kDeprecatedBlock, false,
519519
test::kDefaultFormatVersion),
520520
std::make_tuple(BFP::kAuto, true, test::kDefaultFormatVersion),
521521
std::make_tuple(BFP::kAuto, false, test::kDefaultFormatVersion)));
522522

523-
INSTANTIATE_TEST_SUITE_P(
523+
INSTANTIATE_TEST_CASE_P(
524524
FormatLatest, DBBloomFilterTestWithParam,
525525
::testing::Values(
526526
std::make_tuple(BFP::kDeprecatedBlock, false,
@@ -1226,15 +1226,18 @@ TEST_P(DBBloomFilterTestVaryPrefixAndFormatVer, PartitionedMultiGet) {
12261226
EXPECT_TRUE(found_spanning >= 2);
12271227
}
12281228

1229-
INSTANTIATE_TEST_SUITE_P(
1230-
DBBloomFilterTestVaryPrefixAndFormatVer,
1231-
DBBloomFilterTestVaryPrefixAndFormatVer,
1232-
::testing::Values(
1233-
// (use_prefix, format_version)
1234-
std::make_tuple(false, 2), std::make_tuple(false, 3),
1235-
std::make_tuple(false, 4), std::make_tuple(false, 5),
1236-
std::make_tuple(true, 2), std::make_tuple(true, 3),
1237-
std::make_tuple(true, 4), std::make_tuple(true, 5)));
1229+
INSTANTIATE_TEST_CASE_P(DBBloomFilterTestVaryPrefixAndFormatVer,
1230+
DBBloomFilterTestVaryPrefixAndFormatVer,
1231+
::testing::Values(
1232+
// (use_prefix, format_version)
1233+
std::make_tuple(false, 2),
1234+
std::make_tuple(false, 3),
1235+
std::make_tuple(false, 4),
1236+
std::make_tuple(false, 5),
1237+
std::make_tuple(true, 2),
1238+
std::make_tuple(true, 3),
1239+
std::make_tuple(true, 4),
1240+
std::make_tuple(true, 5)));
12381241

12391242
#ifndef ROCKSDB_LITE
12401243
namespace {
@@ -1404,7 +1407,7 @@ TEST_P(BloomStatsTestWithParam, BloomStatsTestWithIter) {
14041407
ASSERT_EQ(expected_hits, get_perf_context()->bloom_sst_hit_count);
14051408
}
14061409

1407-
INSTANTIATE_TEST_SUITE_P(
1410+
INSTANTIATE_TEST_CASE_P(
14081411
BloomStatsTestWithParam, BloomStatsTestWithParam,
14091412
::testing::Values(std::make_tuple(BFP::kDeprecatedBlock, false),
14101413
std::make_tuple(BFP::kLegacyBloom, false),

‎db/db_compaction_filter_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class DBTestCompactionFilterWithCompactParam
4646
};
4747

4848
#ifndef ROCKSDB_VALGRIND_RUN
49-
INSTANTIATE_TEST_SUITE_P(
49+
INSTANTIATE_TEST_CASE_P(
5050
CompactionFilterWithOption, DBTestCompactionFilterWithCompactParam,
5151
::testing::Values(DBTestBase::OptionConfig::kDefault,
5252
DBTestBase::OptionConfig::kUniversalCompaction,
@@ -55,9 +55,9 @@ INSTANTIATE_TEST_SUITE_P(
5555
DBTestBase::OptionConfig::kUniversalSubcompactions));
5656
#else
5757
// Run fewer cases in valgrind
58-
INSTANTIATE_TEST_SUITE_P(CompactionFilterWithOption,
59-
DBTestCompactionFilterWithCompactParam,
60-
::testing::Values(DBTestBase::OptionConfig::kDefault));
58+
INSTANTIATE_TEST_CASE_P(CompactionFilterWithOption,
59+
DBTestCompactionFilterWithCompactParam,
60+
::testing::Values(DBTestBase::OptionConfig::kDefault));
6161
#endif // ROCKSDB_VALGRIND_RUN
6262

6363
class KeepFilter : public CompactionFilter {

‎db/db_compaction_test.cc

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4690,11 +4690,11 @@ TEST_F(DBCompactionTest, CompactionLimiter) {
46904690
ASSERT_OK(dbfull()->TEST_WaitForCompact());
46914691
}
46924692

4693-
INSTANTIATE_TEST_SUITE_P(DBCompactionTestWithParam, DBCompactionTestWithParam,
4694-
testing::Values(std::make_tuple(1, true),
4695-
std::make_tuple(1, false),
4696-
std::make_tuple(4, true),
4697-
std::make_tuple(4, false)));
4693+
INSTANTIATE_TEST_CASE_P(DBCompactionTestWithParam, DBCompactionTestWithParam,
4694+
::testing::Values(std::make_tuple(1, true),
4695+
std::make_tuple(1, false),
4696+
std::make_tuple(4, true),
4697+
std::make_tuple(4, false)));
46984698

46994699
TEST_P(DBCompactionDirectIOTest, DirectIO) {
47004700
Options options = CurrentOptions();
@@ -4728,8 +4728,8 @@ TEST_P(DBCompactionDirectIOTest, DirectIO) {
47284728
delete options.env;
47294729
}
47304730

4731-
INSTANTIATE_TEST_SUITE_P(DBCompactionDirectIOTest, DBCompactionDirectIOTest,
4732-
testing::Bool());
4731+
INSTANTIATE_TEST_CASE_P(DBCompactionDirectIOTest, DBCompactionDirectIOTest,
4732+
testing::Bool());
47334733

47344734
class CompactionPriTest : public DBTestBase,
47354735
public testing::WithParamInterface<uint32_t> {
@@ -4774,11 +4774,12 @@ TEST_P(CompactionPriTest, Test) {
47744774
}
47754775
}
47764776

4777-
INSTANTIATE_TEST_SUITE_P(CompactionPriTest, CompactionPriTest,
4778-
testing::Values(CompactionPri::kByCompensatedSize,
4779-
CompactionPri::kOldestLargestSeqFirst,
4780-
CompactionPri::kOldestSmallestSeqFirst,
4781-
CompactionPri::kMinOverlappingRatio));
4777+
INSTANTIATE_TEST_CASE_P(
4778+
CompactionPriTest, CompactionPriTest,
4779+
::testing::Values(CompactionPri::kByCompensatedSize,
4780+
CompactionPri::kOldestLargestSeqFirst,
4781+
CompactionPri::kOldestSmallestSeqFirst,
4782+
CompactionPri::kMinOverlappingRatio));
47824783

47834784
class NoopMergeOperator : public MergeOperator {
47844785
public:

‎db/db_flush_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -770,10 +770,10 @@ TEST_P(DBAtomicFlushTest, RollbackAfterFailToInstallResults) {
770770
SyncPoint::GetInstance()->ClearAllCallBacks();
771771
}
772772

773-
INSTANTIATE_TEST_SUITE_P(DBFlushDirectIOTest, DBFlushDirectIOTest,
774-
testing::Bool());
773+
INSTANTIATE_TEST_CASE_P(DBFlushDirectIOTest, DBFlushDirectIOTest,
774+
testing::Bool());
775775

776-
INSTANTIATE_TEST_SUITE_P(DBAtomicFlushTest, DBAtomicFlushTest, testing::Bool());
776+
INSTANTIATE_TEST_CASE_P(DBAtomicFlushTest, DBAtomicFlushTest, testing::Bool());
777777

778778
} // namespace ROCKSDB_NAMESPACE
779779

‎db/db_iterator_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,8 +2881,8 @@ TEST_P(DBIteratorTest, IterateWithLowerBoundAcrossFileBoundary) {
28812881
ASSERT_OK(iter->status());
28822882
}
28832883

2884-
INSTANTIATE_TEST_SUITE_P(DBIteratorTestInstance, DBIteratorTest,
2885-
testing::Values(true, false));
2884+
INSTANTIATE_TEST_CASE_P(DBIteratorTestInstance, DBIteratorTest,
2885+
testing::Values(true, false));
28862886

28872887
// Tests how DBIter work with ReadCallback
28882888
class DBIteratorWithReadCallbackTest : public DBIteratorTest {};

‎db/db_merge_operator_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ class MergeOperatorPinningTest : public DBMergeOperatorTest,
210210
bool disable_block_cache_;
211211
};
212212

213-
INSTANTIATE_TEST_SUITE_P(MergeOperatorPinningTest, MergeOperatorPinningTest,
214-
::testing::Bool());
213+
INSTANTIATE_TEST_CASE_P(MergeOperatorPinningTest, MergeOperatorPinningTest,
214+
::testing::Bool());
215215

216216
#ifndef ROCKSDB_LITE
217217
TEST_P(MergeOperatorPinningTest, OperandsMultiBlocks) {
@@ -588,7 +588,7 @@ class PerConfigMergeOperatorPinningTest
588588
bool disable_block_cache_;
589589
};
590590

591-
INSTANTIATE_TEST_SUITE_P(
591+
INSTANTIATE_TEST_CASE_P(
592592
MergeOperatorPinningTest, PerConfigMergeOperatorPinningTest,
593593
::testing::Combine(::testing::Bool(),
594594
::testing::Range(static_cast<int>(DBTestBase::kDefault),

‎db/db_sst_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,9 @@ TEST_P(DBWALTestWithParam, WALTrashCleanupOnOpen) {
582582
Close();
583583
}
584584

585-
INSTANTIATE_TEST_SUITE_P(DBWALTestWithParam, DBWALTestWithParam,
586-
::testing::Values(std::make_tuple("", true),
587-
std::make_tuple("_wal_dir", false)));
585+
INSTANTIATE_TEST_CASE_P(DBWALTestWithParam, DBWALTestWithParam,
586+
::testing::Values(std::make_tuple("", true),
587+
std::make_tuple("_wal_dir", false)));
588588

589589
TEST_F(DBSSTTest, OpenDBWithExistingTrash) {
590590
Options options = CurrentOptions();

‎db/db_table_properties_test.cc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,13 @@ TEST_P(DBTablePropertiesTest, DeletionTriggeredCompactionMarking) {
345345
ASSERT_EQ(1, NumTableFilesAtLevel(0));
346346
}
347347

348-
INSTANTIATE_TEST_SUITE_P(DBTablePropertiesTest, DBTablePropertiesTest,
349-
::testing::Values("kCompactionStyleLevel",
350-
"kCompactionStyleUniversal"));
348+
INSTANTIATE_TEST_CASE_P(
349+
DBTablePropertiesTest,
350+
DBTablePropertiesTest,
351+
::testing::Values(
352+
"kCompactionStyleLevel",
353+
"kCompactionStyleUniversal"
354+
));
351355

352356
} // namespace ROCKSDB_NAMESPACE
353357

0 commit comments

Comments
 (0)