From 3c750b59aeb7ab826bfdcc14a9d758fb9d1b37ec Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Thu, 22 Oct 2015 15:15:37 -0700 Subject: [PATCH] No need to #ifdef test only code on windows --- db/column_family_test.cc | 7 ------- db/compaction_job_stats_test.cc | 2 +- db/db_compaction_filter_test.cc | 4 ---- db/db_compaction_test.cc | 6 +++--- db/db_dynamic_level_test.cc | 6 +++--- db/db_iter_test.cc | 3 --- db/db_log_iter_test.cc | 6 +++--- db/db_table_properties_test.cc | 4 ---- db/db_tailing_iter_test.cc | 6 +++--- db/db_test.cc | 7 ------- db/db_test_util.cc | 3 --- db/db_universal_compaction_test.cc | 6 +++--- db/db_wal_test.cc | 8 -------- db/fault_injection_test.cc | 8 -------- utilities/checkpoint/checkpoint_test.cc | 8 -------- 15 files changed, 16 insertions(+), 68 deletions(-) diff --git a/db/column_family_test.cc b/db/column_family_test.cc index a258b83df..938c4121a 100644 --- a/db/column_family_test.cc +++ b/db/column_family_test.cc @@ -23,8 +23,6 @@ #include "util/sync_point.h" #include "utilities/merge_operators.h" -#if !(defined NDEBUG) || !defined(OS_WIN) - namespace rocksdb { namespace { @@ -1262,13 +1260,8 @@ TEST_F(ColumnFamilyTest, FlushAndDropRaceCondition) { } } // namespace rocksdb -#endif int main(int argc, char** argv) { -#if !(defined NDEBUG) || !defined(OS_WIN) ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -#else - return 0; -#endif } diff --git a/db/compaction_job_stats_test.cc b/db/compaction_job_stats_test.cc index d6a82e18d..c7d8eb821 100644 --- a/db/compaction_job_stats_test.cc +++ b/db/compaction_job_stats_test.cc @@ -64,7 +64,7 @@ #include "util/xfunc.h" #include "utilities/merge_operators.h" -#if !defined(IOS_CROSS_COMPILE) && (!defined(NDEBUG) || !defined(OS_WIN)) +#if !defined(IOS_CROSS_COMPILE) #ifndef ROCKSDB_LITE namespace rocksdb { diff --git a/db/db_compaction_filter_test.cc b/db/db_compaction_filter_test.cc index 7535ea53a..e99db81f7 100644 --- a/db/db_compaction_filter_test.cc +++ b/db/db_compaction_filter_test.cc @@ -625,11 +625,7 @@ TEST_F(DBTestCompactionFilter, CompactionFilterSnapshot) { } // namespace rocksdb int main(int argc, char** argv) { -#if !(defined NDEBUG) || !defined(OS_WIN) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -#else - return 0; -#endif } diff --git a/db/db_compaction_test.cc b/db/db_compaction_test.cc index be53fdfde..1ff946966 100644 --- a/db/db_compaction_test.cc +++ b/db/db_compaction_test.cc @@ -14,7 +14,7 @@ namespace rocksdb { // SYNC_POINT is not supported in released Windows mode. -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) class DBCompactionTest : public DBTestBase { public: @@ -1852,11 +1852,11 @@ TEST_P(DBCompactionTestWithParam, ForceBottommostLevelCompaction) { INSTANTIATE_TEST_CASE_P(DBCompactionTestWithParam, DBCompactionTestWithParam, ::testing::Values(1, 4)); -#endif // (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#endif // !defined(ROCKSDB_LITE) } // namespace rocksdb int main(int argc, char** argv) { -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/db/db_dynamic_level_test.cc b/db/db_dynamic_level_test.cc index 03e632a77..f29985e05 100644 --- a/db/db_dynamic_level_test.cc +++ b/db/db_dynamic_level_test.cc @@ -10,7 +10,7 @@ // Introduction of SyncPoint effectively disabled building and running this test // in Release build. // which is a pity, it is a good test -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) #include "db/db_test_util.h" #include "port/stack_trace.h" @@ -484,10 +484,10 @@ TEST_F(DBTestDynamicLevel, MigrateToDynamicLevelMaxBytesBase) { } } // namespace rocksdb -#endif // (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#endif // !defined(ROCKSDB_LITE) int main(int argc, char** argv) { -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/db/db_iter_test.cc b/db/db_iter_test.cc index ed5c28bae..f1e3324d8 100644 --- a/db/db_iter_test.cc +++ b/db/db_iter_test.cc @@ -1943,8 +1943,6 @@ TEST_F(DBIterWithMergeIterTest, InnerMergeIterator2) { ASSERT_EQ(db_iter_->value().ToString(), "4"); } -#if !(defined NDEBUG) || !defined(OS_WIN) - TEST_F(DBIterWithMergeIterTest, InnerMergeIteratorDataRace1) { // Test Prev() when one child iterator is at its end but more rows // are added. @@ -2295,7 +2293,6 @@ TEST_F(DBIterWithMergeIterTest, InnerMergeIteratorDataRace8) { rocksdb::SyncPoint::GetInstance()->DisableProcessing(); } -#endif // #if !(defined NDEBUG) || !defined(OS_WIN) } // namespace rocksdb int main(int argc, char** argv) { diff --git a/db/db_log_iter_test.cc b/db/db_log_iter_test.cc index cb5ccdc26..64a74e02e 100644 --- a/db/db_log_iter_test.cc +++ b/db/db_log_iter_test.cc @@ -10,7 +10,7 @@ // Introduction of SyncPoint effectively disabled building and running this test // in Release build. // which is a pity, it is a good test -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) #include "db/db_test_util.h" #include "port/stack_trace.h" @@ -277,10 +277,10 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorBlobs) { } } // namespace rocksdb -#endif // (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#endif // !defined(ROCKSDB_LITE) int main(int argc, char** argv) { -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/db/db_table_properties_test.cc b/db/db_table_properties_test.cc index f1f4558c5..29afa0d9e 100644 --- a/db/db_table_properties_test.cc +++ b/db/db_table_properties_test.cc @@ -207,11 +207,7 @@ TEST_F(DBTablePropertiesTest, GetPropertiesOfTablesInRange) { #endif // ROCKSDB_LITE int main(int argc, char** argv) { -#if !(defined NDEBUG) || !defined(OS_WIN) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -#else - return 0; -#endif } diff --git a/db/db_tailing_iter_test.cc b/db/db_tailing_iter_test.cc index 87e4f1cab..3be5e953c 100644 --- a/db/db_tailing_iter_test.cc +++ b/db/db_tailing_iter_test.cc @@ -10,7 +10,7 @@ // Introduction of SyncPoint effectively disabled building and running this test // in Release build. // which is a pity, it is a good test -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) #include "db/db_test_util.h" #include "db/forward_iterator.h" @@ -646,10 +646,10 @@ TEST_F(DBTestTailingIterator, ManagedTailingIteratorSeekToSame) { } // namespace rocksdb -#endif // (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#endif // !defined(ROCKSDB_LITE) int main(int argc, char** argv) { -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/db/db_test.cc b/db/db_test.cc index 93f355185..a2f8ea587 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -10,8 +10,6 @@ // Introduction of SyncPoint effectively disabled building and running this test // in Release build. // which is a pity, it is a good test -#if !(defined NDEBUG) || !defined(OS_WIN) - #include #include #include @@ -10045,14 +10043,9 @@ INSTANTIATE_TEST_CASE_P(BloomStatsTestWithParam, BloomStatsTestWithParam, #endif // ROCKSDB_LITE } // namespace rocksdb -#endif int main(int argc, char** argv) { -#if !(defined NDEBUG) || !defined(OS_WIN) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -#else - return 0; -#endif } diff --git a/db/db_test_util.cc b/db/db_test_util.cc index ab0ab4d69..06e536576 100644 --- a/db/db_test_util.cc +++ b/db/db_test_util.cc @@ -58,12 +58,9 @@ DBTestBase::DBTestBase(const std::string path) } DBTestBase::~DBTestBase() { -// SyncPoint is not supported in Released Windows Mode. -#if !(defined NDEBUG) || !defined(OS_WIN) rocksdb::SyncPoint::GetInstance()->DisableProcessing(); rocksdb::SyncPoint::GetInstance()->LoadDependency({}); rocksdb::SyncPoint::GetInstance()->ClearAllCallBacks(); -#endif // !(defined NDEBUG) || !defined(OS_WIN) Close(); Options options; options.db_paths.emplace_back(dbname_, 0); diff --git a/db/db_universal_compaction_test.cc b/db/db_universal_compaction_test.cc index 3323afe31..ec4ec32b8 100644 --- a/db/db_universal_compaction_test.cc +++ b/db/db_universal_compaction_test.cc @@ -9,7 +9,7 @@ #include "db/db_test_util.h" #include "port/stack_trace.h" -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) #include "util/sync_point.h" namespace rocksdb { @@ -1210,10 +1210,10 @@ INSTANTIATE_TEST_CASE_P(DBTestUniversalManualCompactionOutputPathId, } // namespace rocksdb -#endif // (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#endif // !defined(ROCKSDB_LITE) int main(int argc, char** argv) { -#if (!(defined NDEBUG) || !defined(OS_WIN)) && !defined(ROCKSDB_LITE) +#if !defined(ROCKSDB_LITE) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/db/db_wal_test.cc b/db/db_wal_test.cc index 7cbaacd61..9e8a19dce 100644 --- a/db/db_wal_test.cc +++ b/db/db_wal_test.cc @@ -9,9 +9,7 @@ #include "db/db_test_util.h" #include "port/stack_trace.h" -#if !(defined NDEBUG) || !defined(OS_WIN) #include "util/sync_point.h" -#endif namespace rocksdb { class DBWALTest : public DBTestBase { @@ -70,7 +68,6 @@ TEST_F(DBWALTest, RollLog) { } while (ChangeOptions()); } -#if !(defined NDEBUG) || !defined(OS_WIN) TEST_F(DBWALTest, SyncWALNotBlockWrite) { Options options = CurrentOptions(); options.max_write_buffer_number = 4; @@ -130,15 +127,10 @@ TEST_F(DBWALTest, SyncWALNotWaitWrite) { ASSERT_EQ(Get("foo2"), "bar2"); rocksdb::SyncPoint::GetInstance()->DisableProcessing(); } -#endif } // namespace rocksdb int main(int argc, char** argv) { -#if !(defined NDEBUG) || !defined(OS_WIN) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -#else - return 0; -#endif } diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc index 84a6e9a52..03d829b20 100644 --- a/db/fault_injection_test.cc +++ b/db/fault_injection_test.cc @@ -11,8 +11,6 @@ // the last "sync". It then checks for data loss errors by purposely dropping // file data (or entire files) not protected by a "sync". -#if !(defined NDEBUG) || !defined(OS_WIN) - #include #include #include "db/db_impl.h" @@ -902,13 +900,7 @@ INSTANTIATE_TEST_CASE_P(FaultTest, FaultInjectionTest, ::testing::Bool()); } // namespace rocksdb -#endif // #if !(defined NDEBUG) || !defined(OS_WIN) - int main(int argc, char** argv) { -#if !(defined NDEBUG) || !defined(OS_WIN) ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -#else - return 0; -#endif } diff --git a/utilities/checkpoint/checkpoint_test.cc b/utilities/checkpoint/checkpoint_test.cc index 5cd72ea64..27c1beb5f 100644 --- a/utilities/checkpoint/checkpoint_test.cc +++ b/utilities/checkpoint/checkpoint_test.cc @@ -10,8 +10,6 @@ // Syncpoint prevents us building and running tests in release #ifndef ROCKSDB_LITE -#if !defined(NDEBUG) || !defined(OS_WIN) - #ifndef OS_WIN #include #endif @@ -350,16 +348,10 @@ TEST_F(DBTest, CheckpointCF) { } // namespace rocksdb -#endif - int main(int argc, char** argv) { -#if !defined(NDEBUG) || !defined(OS_WIN) rocksdb::port::InstallStackTraceHandler(); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -#else - return 0; -#endif } #else