diff --git a/db/db_bloom_filter_test.cc b/db/db_bloom_filter_test.cc index 84d7facd2..0168b7e2d 100644 --- a/db/db_bloom_filter_test.cc +++ b/db/db_bloom_filter_test.cc @@ -499,6 +499,7 @@ TEST_P(DBBloomFilterTestWithParam, BloomFilter) { } while (ChangeCompactOptions()); } +#ifndef ROCKSDB_VALGRIND_RUN INSTANTIATE_TEST_CASE_P( FormatDef, DBBloomFilterTestDefFormatVersion, ::testing::Values(std::make_tuple(true, false, test::kDefaultFormatVersion), @@ -519,6 +520,7 @@ INSTANTIATE_TEST_CASE_P( std::make_tuple(false, true, test::kLatestFormatVersion), std::make_tuple(false, false, test::kLatestFormatVersion))); +#endif // ROCKSDB_VALGRIND_RUN TEST_F(DBBloomFilterTest, BloomFilterRate) { while (ChangeFilterOptions()) { diff --git a/table/table_test.cc b/table/table_test.cc index 5a755db3e..2e209a3ec 100644 --- a/table/table_test.cc +++ b/table/table_test.cc @@ -2786,6 +2786,7 @@ TEST_F(GeneralTableTest, ApproximateOffsetOfCompressed) { } } +#ifndef ROCKSDB_VALGRIND_RUN // RandomizedHarnessTest is very slow for certain combination of arguments // Split into 8 pieces to reduce the time individual tests take. TEST_F(HarnessTest, Randomized1) { @@ -2869,6 +2870,7 @@ TEST_F(HarnessTest, RandomizedLongDB) { ASSERT_GT(files, 0); } #endif // ROCKSDB_LITE +#endif // ROCKSDB_VALGRIND_RUN class MemTableTest : public testing::Test {}; diff --git a/utilities/transactions/transaction_test.cc b/utilities/transactions/transaction_test.cc index f49c92257..0968b9a34 100644 --- a/utilities/transactions/transaction_test.cc +++ b/utilities/transactions/transaction_test.cc @@ -606,6 +606,7 @@ TEST_P(TransactionTest, DeadlockCycleShared) { } } +#ifndef ROCKSDB_VALGRIND_RUN TEST_P(TransactionStressTest, DeadlockCycle) { WriteOptions write_options; ReadOptions read_options; @@ -768,6 +769,7 @@ TEST_P(TransactionStressTest, DeadlockStress) { t.join(); } } +#endif // ROCKSDB_VALGRIND_RUN TEST_P(TransactionTest, CommitTimeBatchFailTest) { WriteOptions write_options; @@ -1097,6 +1099,7 @@ TEST_P(TransactionTest, TwoPhaseEmptyWriteTest) { } } +#ifndef ROCKSDB_VALGRIND_RUN TEST_P(TransactionStressTest, TwoPhaseExpirationTest) { Status s; @@ -1334,6 +1337,7 @@ TEST_P(TransactionTest, PersistentTwoPhaseTransactionTest) { // deleting transaction should unregister transaction ASSERT_EQ(db->GetTransactionByName("xid"), nullptr); } +#endif // ROCKSDB_VALGRIND_RUN // TODO this test needs to be updated with serial commits TEST_P(TransactionTest, DISABLED_TwoPhaseMultiThreadTest) {