diff --git a/.circleci/config.yml b/.circleci/config.yml index c369795f94..363238cd0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -178,7 +178,7 @@ jobs: steps: - pre-steps - install-gflags - - run: ASSERT_STATUS_CHECKED=1 TEST_UINT128_COMPAT=1 ROCKSDB_MODIFY_NPHASH=1 LIB_MODE=shared OPT="-DROCKSDB_NAMESPACE=alternative_rocksdb_ns" make V=1 -j32 all check_some | .circleci/cat_ignore_eagain + - run: ASSERT_STATUS_CHECKED=1 TEST_UINT128_COMPAT=1 ROCKSDB_MODIFY_NPHASH=1 LIB_MODE=shared OPT="-DROCKSDB_NAMESPACE=alternative_rocksdb_ns" make V=1 -j32 check | .circleci/cat_ignore_eagain - post-steps build-linux-release: diff --git a/Makefile b/Makefile index 927c34a8fc..053ab1aeb9 100644 --- a/Makefile +++ b/Makefile @@ -536,236 +536,34 @@ ifeq ($(USE_FOLLY_DISTRIBUTED_MUTEX),1) ALL_SOURCES += third-party/folly/folly/synchronization/test/DistributedMutexTest.cc endif -PARALLEL_TEST = \ - backupable_db_test \ - db_bloom_filter_test \ - db_compaction_filter_test \ - db_compaction_test \ - db_merge_operator_test \ - db_sst_test \ - db_test \ - db_test2 \ - db_universal_compaction_test \ - db_wal_test \ - column_family_test \ - external_sst_file_test \ - import_column_family_test \ - fault_injection_test \ - file_reader_writer_test \ - inlineskiplist_test \ - manual_compaction_test \ - persistent_cache_test \ - table_test \ - transaction_test \ - point_lock_manager_test \ - range_locking_test \ - write_prepared_transaction_test \ - write_unprepared_transaction_test \ - -ifeq ($(USE_FOLLY_DISTRIBUTED_MUTEX),1) - TESTS += folly_synchronization_distributed_mutex_test - PARALLEL_TEST += folly_synchronization_distributed_mutex_test - TESTS_PASSING_ASC = folly_synchronization_distributed_mutex_test -endif - # options_settable_test doesn't pass with UBSAN as we use hack in the test ifdef COMPILE_WITH_UBSAN TESTS := $(shell echo $(TESTS) | sed 's/\boptions_settable_test\b//g') endif ifdef ASSERT_STATUS_CHECKED -# This is a new check for which we will add support incrementally. This -# list can be removed once support is fully added. - TESTS_PASSING_ASC = \ - arena_test \ - autovector_test \ - cache_test \ - lru_cache_test \ - blob_file_addition_test \ - blob_file_builder_test \ - blob_file_cache_test \ - blob_file_garbage_test \ - blob_file_reader_test \ - bloom_test \ - cassandra_format_test \ - cassandra_functional_test \ - cassandra_row_merge_test \ - cassandra_serialize_test \ - cleanable_test \ - checkpoint_test \ - coding_test \ - crc32c_test \ - dbformat_test \ - db_basic_test \ - compact_files_test \ - compaction_picker_test \ - comparator_db_test \ - db_encryption_test \ - db_iter_test \ - db_iter_stress_test \ - db_log_iter_test \ - db_bloom_filter_test \ - db_blob_basic_test \ - db_blob_compaction_test \ - db_blob_corruption_test \ - db_blob_index_test \ - db_block_cache_test \ - db_compaction_test \ - db_compaction_filter_test \ - db_dynamic_level_test \ - db_flush_test \ - db_inplace_update_test \ - db_io_failure_test \ - db_iterator_test \ - db_kv_checksum_test \ - db_logical_block_size_cache_test \ - db_memtable_test \ - db_merge_operand_test \ - db_merge_operator_test \ - db_wal_test \ - db_with_timestamp_basic_test \ - db_with_timestamp_compaction_test \ - db_write_test \ - db_options_test \ - db_properties_test \ - db_range_del_test \ - db_secondary_test \ - deletefile_test \ - external_sst_file_test \ - options_file_test \ - db_sst_test \ - db_statistics_test \ - db_table_properties_test \ - db_tailing_iter_test \ - fault_injection_test \ - listener_test \ - log_test \ - manual_compaction_test \ - obsolete_files_test \ - perf_context_test \ - periodic_work_scheduler_test \ - perf_context_test \ - version_set_test \ - wal_manager_test \ - defer_test \ - filename_test \ - dynamic_bloom_test \ - env_basic_test \ - env_test \ - env_logger_test \ - event_logger_test \ - error_handler_fs_test \ - external_sst_file_basic_test \ - auto_roll_logger_test \ - file_indexer_test \ - delete_scheduler_test \ - flush_job_test \ - hash_table_test \ - hash_test \ - heap_test \ - histogram_test \ - inlineskiplist_test \ - io_posix_test \ - iostats_context_test \ - ldb_cmd_test \ - memkind_kmem_allocator_test \ - merge_test \ - merger_test \ - mock_env_test \ - object_registry_test \ - optimistic_transaction_test \ - prefix_test \ - plain_table_db_test \ - repair_test \ - configurable_test \ - customizable_test \ - options_settable_test \ - options_test \ - point_lock_manager_test \ - random_access_file_reader_test \ - random_test \ - range_del_aggregator_test \ - sst_file_reader_test \ - range_tombstone_fragmenter_test \ - repeatable_thread_test \ - ribbon_test \ - skiplist_test \ - slice_test \ - slice_transform_test \ - sst_dump_test \ - statistics_test \ - stats_history_test \ - stringappend_test \ - thread_local_test \ - trace_analyzer_test \ - transaction_test \ - env_timed_test \ - filelock_test \ - timer_queue_test \ - timer_test \ - options_util_test \ - persistent_cache_test \ - util_merge_operators_test \ - block_cache_trace_analyzer_test \ - block_cache_tracer_test \ - cache_simulator_test \ - sim_cache_test \ - version_builder_test \ - version_edit_test \ - work_queue_test \ - write_buffer_manager_test \ - write_controller_test \ - write_prepared_transaction_test \ - write_unprepared_transaction_test \ - compaction_iterator_test \ - compaction_job_test \ - compaction_job_stats_test \ - io_tracer_test \ - io_tracer_parser_test \ - prefetch_test \ - merge_helper_test \ - memtable_list_test \ - flush_job_test \ - block_based_filter_block_test \ - block_fetcher_test \ - block_test \ - data_block_hash_index_test \ - full_filter_block_test \ - partitioned_filter_block_test \ - column_family_test \ - file_reader_writer_test \ - rate_limiter_test \ - corruption_test \ - reduce_levels_test \ - thread_list_test \ - compact_on_deletion_collector_test \ - db_universal_compaction_test \ - import_column_family_test \ - option_change_migration_test \ - cuckoo_table_builder_test \ - cuckoo_table_db_test \ - cuckoo_table_reader_test \ - memory_test \ - table_test \ - backupable_db_test \ - blob_db_test \ - ttl_test \ - write_batch_test \ - write_batch_with_index_test \ + # TODO: finish fixing all tests to pass this check + TESTS_FAILING_ASC = \ + db_test \ + db_test2 \ + range_locking_test \ + testutil_test \ -ifeq ($(USE_FOLLY_DISTRIBUTED_MUTEX),1) -TESTS_PASSING_ASC += folly_synchronization_distributed_mutex_test + # Since we have very few ASC exclusions left, excluding them from + # the build is the most convenient way to exclude them from testing + TESTS := $(filter-out $(TESTS_FAILING_ASC),$(TESTS)) endif - # Enable building all unit tests, but use check_some to run only tests - # known to pass ASC (ASSERT_STATUS_CHECKED) - ROCKSDBTESTS_SUBSET ?= $(TESTS_PASSING_ASC) - # Alternate: only build unit tests known to pass ASC, and run them - # with make check - #TESTS := $(filter $(TESTS_PASSING_ASC),$(TESTS)) - #PARALLEL_TEST := $(filter $(TESTS_PASSING_ASC),$(PARALLEL_TEST)) -else - ROCKSDBTESTS_SUBSET ?= $(TESTS) -endif +ROCKSDBTESTS_SUBSET ?= $(TESTS) + +# env_test - suspicious use of test::TmpDir +# deletefile_test - serial because it generates giant temporary files in +# its various tests. Parallel can fill up your /dev/shm +NON_PARALLEL_TEST = \ + env_test \ + deletefile_test \ + +PARALLEL_TEST = $(filter-out $(NON_PARALLEL_TEST), $(TESTS)) + # Not necessarily well thought out or up-to-date, but matches old list TESTS_PLATFORM_DEPENDENT := \ db_basic_test \ diff --git a/TARGETS b/TARGETS index 7e1b3ac6b2..4c1d450f87 100644 --- a/TARGETS +++ b/TARGETS @@ -857,21 +857,21 @@ ROCKS_TESTS = [ [ "arena_test", "memory/arena_test.cc", - "serial", + "parallel", [], [], ], [ "auto_roll_logger_test", "logging/auto_roll_logger_test.cc", - "serial", + "parallel", [], [], ], [ "autovector_test", "util/autovector_test.cc", - "serial", + "parallel", [], [], ], @@ -885,154 +885,154 @@ ROCKS_TESTS = [ [ "blob_db_test", "utilities/blob_db/blob_db_test.cc", - "serial", + "parallel", [], [], ], [ "blob_file_addition_test", "db/blob/blob_file_addition_test.cc", - "serial", + "parallel", [], [], ], [ "blob_file_builder_test", "db/blob/blob_file_builder_test.cc", - "serial", + "parallel", [], [], ], [ "blob_file_cache_test", "db/blob/blob_file_cache_test.cc", - "serial", + "parallel", [], [], ], [ "blob_file_garbage_test", "db/blob/blob_file_garbage_test.cc", - "serial", + "parallel", [], [], ], [ "blob_file_reader_test", "db/blob/blob_file_reader_test.cc", - "serial", + "parallel", [], [], ], [ "block_based_filter_block_test", "table/block_based/block_based_filter_block_test.cc", - "serial", + "parallel", [], [], ], [ "block_based_table_reader_test", "table/block_based/block_based_table_reader_test.cc", - "serial", + "parallel", [], [], ], [ "block_cache_trace_analyzer_test", "tools/block_cache_analyzer/block_cache_trace_analyzer_test.cc", - "serial", + "parallel", [], [], ], [ "block_cache_tracer_test", "trace_replay/block_cache_tracer_test.cc", - "serial", + "parallel", [], [], ], [ "block_fetcher_test", "table/block_fetcher_test.cc", - "serial", + "parallel", [], [], ], [ "block_test", "table/block_based/block_test.cc", - "serial", + "parallel", [], [], ], [ "bloom_test", "util/bloom_test.cc", - "serial", + "parallel", [], [], ], [ "cache_simulator_test", "utilities/simulator_cache/cache_simulator_test.cc", - "serial", + "parallel", [], [], ], [ "cache_test", "cache/cache_test.cc", - "serial", + "parallel", [], [], ], [ "cassandra_format_test", "utilities/cassandra/cassandra_format_test.cc", - "serial", + "parallel", [], [], ], [ "cassandra_functional_test", "utilities/cassandra/cassandra_functional_test.cc", - "serial", + "parallel", [], [], ], [ "cassandra_row_merge_test", "utilities/cassandra/cassandra_row_merge_test.cc", - "serial", + "parallel", [], [], ], [ "cassandra_serialize_test", "utilities/cassandra/cassandra_serialize_test.cc", - "serial", + "parallel", [], [], ], [ "checkpoint_test", "utilities/checkpoint/checkpoint_test.cc", - "serial", + "parallel", [], [], ], [ "cleanable_test", "table/cleanable_test.cc", - "serial", + "parallel", [], [], ], [ "coding_test", "util/coding_test.cc", - "serial", + "parallel", [], [], ], @@ -1046,147 +1046,147 @@ ROCKS_TESTS = [ [ "compact_files_test", "db/compact_files_test.cc", - "serial", + "parallel", [], [], ], [ "compact_on_deletion_collector_test", "utilities/table_properties_collectors/compact_on_deletion_collector_test.cc", - "serial", + "parallel", [], [], ], [ "compaction_iterator_test", "db/compaction/compaction_iterator_test.cc", - "serial", + "parallel", [], [], ], [ "compaction_job_stats_test", "db/compaction/compaction_job_stats_test.cc", - "serial", + "parallel", [], [], ], [ "compaction_job_test", "db/compaction/compaction_job_test.cc", - "serial", + "parallel", [], [], ], [ "compaction_picker_test", "db/compaction/compaction_picker_test.cc", - "serial", + "parallel", [], [], ], [ "comparator_db_test", "db/comparator_db_test.cc", - "serial", + "parallel", [], [], ], [ "configurable_test", "options/configurable_test.cc", - "serial", + "parallel", [], [], ], [ "corruption_test", "db/corruption_test.cc", - "serial", + "parallel", [], [], ], [ "crc32c_test", "util/crc32c_test.cc", - "serial", + "parallel", [], [], ], [ "cuckoo_table_builder_test", "table/cuckoo/cuckoo_table_builder_test.cc", - "serial", + "parallel", [], [], ], [ "cuckoo_table_db_test", "db/cuckoo_table_db_test.cc", - "serial", + "parallel", [], [], ], [ "cuckoo_table_reader_test", "table/cuckoo/cuckoo_table_reader_test.cc", - "serial", + "parallel", [], [], ], [ "customizable_test", "options/customizable_test.cc", - "serial", + "parallel", [], [], ], [ "data_block_hash_index_test", "table/block_based/data_block_hash_index_test.cc", - "serial", + "parallel", [], [], ], [ "db_basic_test", "db/db_basic_test.cc", - "serial", + "parallel", [], [], ], [ "db_blob_basic_test", "db/blob/db_blob_basic_test.cc", - "serial", + "parallel", [], [], ], [ "db_blob_compaction_test", "db/blob/db_blob_compaction_test.cc", - "serial", + "parallel", [], [], ], [ "db_blob_corruption_test", "db/blob/db_blob_corruption_test.cc", - "serial", + "parallel", [], [], ], [ "db_blob_index_test", "db/blob/db_blob_index_test.cc", - "serial", + "parallel", [], [], ], [ "db_block_cache_test", "db/db_block_cache_test.cc", - "serial", + "parallel", [], [], ], @@ -1214,91 +1214,91 @@ ROCKS_TESTS = [ [ "db_dynamic_level_test", "db/db_dynamic_level_test.cc", - "serial", + "parallel", [], [], ], [ "db_encryption_test", "db/db_encryption_test.cc", - "serial", + "parallel", [], [], ], [ "db_flush_test", "db/db_flush_test.cc", - "serial", + "parallel", [], [], ], [ "db_inplace_update_test", "db/db_inplace_update_test.cc", - "serial", + "parallel", [], [], ], [ "db_io_failure_test", "db/db_io_failure_test.cc", - "serial", + "parallel", [], [], ], [ "db_iter_stress_test", "db/db_iter_stress_test.cc", - "serial", + "parallel", [], [], ], [ "db_iter_test", "db/db_iter_test.cc", - "serial", + "parallel", [], [], ], [ "db_iterator_test", "db/db_iterator_test.cc", - "serial", + "parallel", [], [], ], [ "db_kv_checksum_test", "db/db_kv_checksum_test.cc", - "serial", + "parallel", [], [], ], [ "db_log_iter_test", "db/db_log_iter_test.cc", - "serial", + "parallel", [], [], ], [ "db_logical_block_size_cache_test", "db/db_logical_block_size_cache_test.cc", - "serial", + "parallel", [], [], ], [ "db_memtable_test", "db/db_memtable_test.cc", - "serial", + "parallel", [], [], ], [ "db_merge_operand_test", "db/db_merge_operand_test.cc", - "serial", + "parallel", [], [], ], @@ -1312,28 +1312,28 @@ ROCKS_TESTS = [ [ "db_options_test", "db/db_options_test.cc", - "serial", + "parallel", [], [], ], [ "db_properties_test", "db/db_properties_test.cc", - "serial", + "parallel", [], [], ], [ "db_range_del_test", "db/db_range_del_test.cc", - "serial", + "parallel", [], [], ], [ "db_secondary_test", "db/db_secondary_test.cc", - "serial", + "parallel", [], [], ], @@ -1347,21 +1347,21 @@ ROCKS_TESTS = [ [ "db_statistics_test", "db/db_statistics_test.cc", - "serial", + "parallel", [], [], ], [ "db_table_properties_test", "db/db_table_properties_test.cc", - "serial", + "parallel", [], [], ], [ "db_tailing_iter_test", "db/db_tailing_iter_test.cc", - "serial", + "parallel", [], [], ], @@ -1396,42 +1396,42 @@ ROCKS_TESTS = [ [ "db_with_timestamp_basic_test", "db/db_with_timestamp_basic_test.cc", - "serial", + "parallel", [], [], ], [ "db_with_timestamp_compaction_test", "db/db_with_timestamp_compaction_test.cc", - "serial", + "parallel", [], [], ], [ "db_write_test", "db/db_write_test.cc", - "serial", + "parallel", [], [], ], [ "dbformat_test", "db/dbformat_test.cc", - "serial", + "parallel", [], [], ], [ "defer_test", "util/defer_test.cc", - "serial", + "parallel", [], [], ], [ "delete_scheduler_test", "file/delete_scheduler_test.cc", - "serial", + "parallel", [], [], ], @@ -1445,21 +1445,21 @@ ROCKS_TESTS = [ [ "dynamic_bloom_test", "util/dynamic_bloom_test.cc", - "serial", + "parallel", [], [], ], [ "env_basic_test", "env/env_basic_test.cc", - "serial", + "parallel", [], [], ], [ "env_logger_test", "logging/env_logger_test.cc", - "serial", + "parallel", [], [], ], @@ -1473,28 +1473,28 @@ ROCKS_TESTS = [ [ "env_timed_test", "utilities/env_timed_test.cc", - "serial", + "parallel", [], [], ], [ "error_handler_fs_test", "db/error_handler_fs_test.cc", - "serial", + "parallel", [], [], ], [ "event_logger_test", "logging/event_logger_test.cc", - "serial", + "parallel", [], [], ], [ "external_sst_file_basic_test", "db/external_sst_file_basic_test.cc", - "serial", + "parallel", [], [], ], @@ -1515,7 +1515,7 @@ ROCKS_TESTS = [ [ "file_indexer_test", "db/file_indexer_test.cc", - "serial", + "parallel", [], [], ], @@ -1529,56 +1529,56 @@ ROCKS_TESTS = [ [ "filelock_test", "util/filelock_test.cc", - "serial", + "parallel", [], [], ], [ "filename_test", "db/filename_test.cc", - "serial", + "parallel", [], [], ], [ "flush_job_test", "db/flush_job_test.cc", - "serial", + "parallel", [], [], ], [ "full_filter_block_test", "table/block_based/full_filter_block_test.cc", - "serial", + "parallel", [], [], ], [ "hash_table_test", "utilities/persistent_cache/hash_table_test.cc", - "serial", + "parallel", [], [], ], [ "hash_test", "util/hash_test.cc", - "serial", + "parallel", [], [], ], [ "heap_test", "util/heap_test.cc", - "serial", + "parallel", [], [], ], [ "histogram_test", "monitoring/histogram_test.cc", - "serial", + "parallel", [], [], ], @@ -1599,56 +1599,56 @@ ROCKS_TESTS = [ [ "io_posix_test", "env/io_posix_test.cc", - "serial", + "parallel", [], [], ], [ "io_tracer_parser_test", "tools/io_tracer_parser_test.cc", - "serial", + "parallel", [], [], ], [ "io_tracer_test", "trace_replay/io_tracer_test.cc", - "serial", + "parallel", [], [], ], [ "iostats_context_test", "monitoring/iostats_context_test.cc", - "serial", + "parallel", [], [], ], [ "ldb_cmd_test", "tools/ldb_cmd_test.cc", - "serial", + "parallel", [], [], ], [ "listener_test", "db/listener_test.cc", - "serial", + "parallel", [], [], ], [ "log_test", "db/log_test.cc", - "serial", + "parallel", [], [], ], [ "lru_cache_test", "cache/lru_cache_test.cc", - "serial", + "parallel", [], [], ], @@ -1662,126 +1662,126 @@ ROCKS_TESTS = [ [ "memkind_kmem_allocator_test", "memory/memkind_kmem_allocator_test.cc", - "serial", + "parallel", [], [], ], [ "memory_test", "utilities/memory/memory_test.cc", - "serial", + "parallel", [], [], ], [ "memtable_list_test", "db/memtable_list_test.cc", - "serial", + "parallel", [], [], ], [ "merge_helper_test", "db/merge_helper_test.cc", - "serial", + "parallel", [], [], ], [ "merge_test", "db/merge_test.cc", - "serial", + "parallel", [], [], ], [ "merger_test", "table/merger_test.cc", - "serial", + "parallel", [], [], ], [ "mock_env_test", "env/mock_env_test.cc", - "serial", + "parallel", [], [], ], [ "object_registry_test", "utilities/object_registry_test.cc", - "serial", + "parallel", [], [], ], [ "obsolete_files_test", "db/obsolete_files_test.cc", - "serial", + "parallel", [], [], ], [ "optimistic_transaction_test", "utilities/transactions/optimistic_transaction_test.cc", - "serial", + "parallel", [], [], ], [ "option_change_migration_test", "utilities/option_change_migration/option_change_migration_test.cc", - "serial", + "parallel", [], [], ], [ "options_file_test", "db/options_file_test.cc", - "serial", + "parallel", [], [], ], [ "options_settable_test", "options/options_settable_test.cc", - "serial", + "parallel", [], [], ], [ "options_test", "options/options_test.cc", - "serial", + "parallel", [], [], ], [ "options_util_test", "utilities/options/options_util_test.cc", - "serial", + "parallel", [], [], ], [ "partitioned_filter_block_test", "table/block_based/partitioned_filter_block_test.cc", - "serial", + "parallel", [], [], ], [ "perf_context_test", "db/perf_context_test.cc", - "serial", + "parallel", [], [], ], [ "periodic_work_scheduler_test", "db/periodic_work_scheduler_test.cc", - "serial", + "parallel", [], [], ], @@ -1795,7 +1795,7 @@ ROCKS_TESTS = [ [ "plain_table_db_test", "db/plain_table_db_test.cc", - "serial", + "parallel", [], [], ], @@ -1809,35 +1809,35 @@ ROCKS_TESTS = [ [ "prefetch_test", "file/prefetch_test.cc", - "serial", + "parallel", [], [], ], [ "prefix_test", "db/prefix_test.cc", - "serial", + "parallel", [], [], ], [ "random_access_file_reader_test", "file/random_access_file_reader_test.cc", - "serial", + "parallel", [], [], ], [ "random_test", "util/random_test.cc", - "serial", + "parallel", [], [], ], [ "range_del_aggregator_test", "db/range_del_aggregator_test.cc", - "serial", + "parallel", [], [], ], @@ -1851,112 +1851,112 @@ ROCKS_TESTS = [ [ "range_tombstone_fragmenter_test", "db/range_tombstone_fragmenter_test.cc", - "serial", + "parallel", [], [], ], [ "rate_limiter_test", "util/rate_limiter_test.cc", - "serial", + "parallel", [], [], ], [ "reduce_levels_test", "tools/reduce_levels_test.cc", - "serial", + "parallel", [], [], ], [ "repair_test", "db/repair_test.cc", - "serial", + "parallel", [], [], ], [ "repeatable_thread_test", "util/repeatable_thread_test.cc", - "serial", + "parallel", [], [], ], [ "ribbon_test", "util/ribbon_test.cc", - "serial", + "parallel", [], [], ], [ "sim_cache_test", "utilities/simulator_cache/sim_cache_test.cc", - "serial", + "parallel", [], [], ], [ "skiplist_test", "memtable/skiplist_test.cc", - "serial", + "parallel", [], [], ], [ "slice_test", "util/slice_test.cc", - "serial", + "parallel", [], [], ], [ "slice_transform_test", "util/slice_transform_test.cc", - "serial", + "parallel", [], [], ], [ "sst_dump_test", "tools/sst_dump_test.cc", - "serial", + "parallel", [], [], ], [ "sst_file_reader_test", "table/sst_file_reader_test.cc", - "serial", + "parallel", [], [], ], [ "statistics_test", "monitoring/statistics_test.cc", - "serial", + "parallel", [], [], ], [ "stats_history_test", "monitoring/stats_history_test.cc", - "serial", + "parallel", [], [], ], [ "stringappend_test", "utilities/merge_operators/string_append/stringappend_test.cc", - "serial", + "parallel", [], [], ], [ "table_properties_collector_test", "db/table_properties_collector_test.cc", - "serial", + "parallel", [], [], ], @@ -1970,42 +1970,42 @@ ROCKS_TESTS = [ [ "testutil_test", "test_util/testutil_test.cc", - "serial", + "parallel", [], [], ], [ "thread_list_test", "util/thread_list_test.cc", - "serial", + "parallel", [], [], ], [ "thread_local_test", "util/thread_local_test.cc", - "serial", + "parallel", [], [], ], [ "timer_queue_test", "util/timer_queue_test.cc", - "serial", + "parallel", [], [], ], [ "timer_test", "util/timer_test.cc", - "serial", + "parallel", [], [], ], [ "trace_analyzer_test", "tools/trace_analyzer_test.cc", - "serial", + "parallel", [], [], ], @@ -2019,84 +2019,84 @@ ROCKS_TESTS = [ [ "ttl_test", "utilities/ttl/ttl_test.cc", - "serial", + "parallel", [], [], ], [ "util_merge_operators_test", "utilities/util_merge_operators_test.cc", - "serial", + "parallel", [], [], ], [ "version_builder_test", "db/version_builder_test.cc", - "serial", + "parallel", [], [], ], [ "version_edit_test", "db/version_edit_test.cc", - "serial", + "parallel", [], [], ], [ "version_set_test", "db/version_set_test.cc", - "serial", + "parallel", [], [], ], [ "wal_manager_test", "db/wal_manager_test.cc", - "serial", + "parallel", [], [], ], [ "work_queue_test", "util/work_queue_test.cc", - "serial", + "parallel", [], [], ], [ "write_batch_test", "db/write_batch_test.cc", - "serial", + "parallel", [], [], ], [ "write_batch_with_index_test", "utilities/write_batch_with_index/write_batch_with_index_test.cc", - "serial", + "parallel", [], [], ], [ "write_buffer_manager_test", "memtable/write_buffer_manager_test.cc", - "serial", + "parallel", [], [], ], [ "write_callback_test", "db/write_callback_test.cc", - "serial", + "parallel", [], [], ], [ "write_controller_test", "db/write_controller_test.cc", - "serial", + "parallel", [], [], ], diff --git a/buckifier/buckify_rocksdb.py b/buckifier/buckify_rocksdb.py index 454b9af7ac..0fc7fc0c93 100644 --- a/buckifier/buckify_rocksdb.py +++ b/buckifier/buckify_rocksdb.py @@ -69,25 +69,25 @@ def get_cc_files(repo_path): return cc_files -# Get parallel tests from Makefile -def get_parallel_tests(repo_path): +# Get non_parallel tests from Makefile +def get_non_parallel_tests(repo_path): Makefile = repo_path + "/Makefile" s = set({}) - found_parallel_tests = False + found_non_parallel_tests = False for line in open(Makefile): line = line.strip() - if line.startswith("PARALLEL_TEST ="): - found_parallel_tests = True - elif found_parallel_tests: + if line.startswith("NON_PARALLEL_TEST ="): + found_non_parallel_tests = True + elif found_non_parallel_tests: if line.endswith("\\"): # remove the trailing \ line = line[:-1] line = line.strip() s.add(line) else: - # we consumed all the parallel tests + # we consumed all the non_parallel tests break return s @@ -123,10 +123,10 @@ def generate_targets(repo_path, deps_map): src_mk = parse_src_mk(repo_path) # get all .cc files cc_files = get_cc_files(repo_path) - # get parallel tests from Makefile - parallel_tests = get_parallel_tests(repo_path) + # get non_parallel tests from Makefile + non_parallel_tests = get_non_parallel_tests(repo_path) - if src_mk is None or cc_files is None or parallel_tests is None: + if src_mk is None or cc_files is None or non_parallel_tests is None: return False extra_argv = "" @@ -211,7 +211,7 @@ def generate_targets(repo_path, deps_map): TARGETS.register_test( test_target_name, test_src, - test in parallel_tests, + test not in non_parallel_tests, json.dumps(deps['extra_deps']), json.dumps(deps['extra_compiler_flags'])) diff --git a/src.mk b/src.mk index 14bec3841e..ad312382f1 100644 --- a/src.mk +++ b/src.mk @@ -435,7 +435,6 @@ TEST_MAIN_SOURCES = \ db/external_sst_file_test.cc \ db/fault_injection_test.cc \ db/file_indexer_test.cc \ - db/file_reader_writer_test.cc \ db/filename_test.cc \ db/flush_job_test.cc \ db/listener_test.cc \