andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Add missing db_log_iter_test in the test list"

Browse Source 
Summary:
This reverts commit 03467bdd4d.

It seems the previous git merge remove all the tabs in Makefile
and cause the Makefile not runnable.  This patch revert that incorrect
merge.

Test Plan: make

Reviewers: sdong, anthony

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D42705

Conflicts:
	CMakeLists.txt
	Makefile
This commit is contained in:
Yueh-Hsuan Chiang 2015-07-20 16:18:35 -07:00
parent 443c6646bc
commit 6867fb19c7
1 changed files with 86 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
Makefile
View File

@ -218,89 +218,87 @@ VALGRIND_VER := $(join $(VALGRIND_VER),valgrind)
VALGRIND_OPTS = --error-exitcode=$(VALGRIND_ERROR) --leak-check=full VALGRIND_OPTS = --error-exitcode=$(VALGRIND_ERROR) --leak-check=full
TESTS = \ TESTS = \
db_test \ db_test \
db_iter_test \ db_iter_test \
db_log_iter_test \ db_log_iter_test \
db_compaction_filter_test \ db_compaction_filter_test \
db_dynamic_level_test \ db_dynamic_level_test \
db_inplace_update_test \ db_tailing_iter_test \
db_log_iter_test \ db_universal_compaction_test \
db_tailing_iter_test \ block_hash_index_test \
db_universal_compaction_test \ autovector_test \
block_hash_index_test \ column_family_test \
autovector_test \ table_properties_collector_test \
column_family_test \ arena_test \
table_properties_collector_test \ auto_roll_logger_test \
arena_test \ block_test \
auto_roll_logger_test \ bloom_test \
block_test \ dynamic_bloom_test \
bloom_test \ c_test \
dynamic_bloom_test \ cache_test \
c_test \ checkpoint_test \
cache_test \ coding_test \
checkpoint_test \ corruption_test \
coding_test \ crc32c_test \
corruption_test \ slice_transform_test \
crc32c_test \ dbformat_test \
slice_transform_test \ env_test \
dbformat_test \ fault_injection_test \
env_test \ filelock_test \
fault_injection_test \ filename_test \
filelock_test \ block_based_filter_block_test \
filename_test \ full_filter_block_test \
block_based_filter_block_test \ histogram_test \
full_filter_block_test \ log_test \
histogram_test \ manual_compaction_test \
log_test \ memenv_test \
manual_compaction_test \ mock_env_test \
memenv_test \ memtable_list_test \
mock_env_test \ merge_helper_test \
memtable_list_test \ merge_test \
merge_helper_test \ merger_test \
merge_test \ redis_test \
merger_test \ reduce_levels_test \
redis_test \ plain_table_db_test \
reduce_levels_test \ comparator_db_test \
plain_table_db_test \ prefix_test \
comparator_db_test \ skiplist_test \
prefix_test \ stringappend_test \
skiplist_test \ ttl_test \
stringappend_test \ backupable_db_test \
ttl_test \ document_db_test \
backupable_db_test \ json_document_test \
document_db_test \ spatial_db_test \
json_document_test \ version_edit_test \
spatial_db_test \ version_set_test \
version_edit_test \ compaction_picker_test \
version_set_test \ version_builder_test \
compaction_picker_test \ file_indexer_test \
version_builder_test \ write_batch_test \
file_indexer_test \ write_batch_with_index_test \
write_batch_test \ write_controller_test\
write_batch_with_index_test \ deletefile_test \
write_controller_test\ table_test \
deletefile_test \ thread_local_test \
table_test \ geodb_test \
thread_local_test \ rate_limiter_test \
geodb_test \ options_test \
rate_limiter_test \ event_logger_test \
options_test \ cuckoo_table_builder_test \
event_logger_test \ cuckoo_table_reader_test \
cuckoo_table_builder_test \ cuckoo_table_db_test \
cuckoo_table_reader_test \ flush_job_test \
cuckoo_table_db_test \ wal_manager_test \
flush_job_test \ listener_test \
wal_manager_test \ compaction_job_test \
listener_test \ thread_list_test \
compaction_job_test \ sst_dump_test \
thread_list_test \ compact_files_test \
sst_dump_test \ perf_context_test \
compact_files_test \ optimistic_transaction_test \
perf_context_test \ write_callback_test \
optimistic_transaction_test \ compaction_job_stats_test \
write_callback_test \ heap_test
compaction_job_stats_test \
heap_test
SUBSET := $(shell echo $(TESTS) |sed s/^.*$(ROCKSDBTESTS_START)/$(ROCKSDBTESTS_START)/) SUBSET := $(shell echo $(TESTS) |sed s/^.*$(ROCKSDBTESTS_START)/$(ROCKSDBTESTS_START)/)
@ -684,16 +682,13 @@ $(AM_LINK)
db_test: db/db_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) db_test: db/db_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
db_compaction_filter_test: db/db_compaction_filter_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) db_log_iter_test: db/db_log_iter_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK)
db_dynamic_level_test: db/db_dynamic_level_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK)
db_inplace_update_test: db/db_inplace_update_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
db_log_iter_test: db/db_log_iter_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) db_compaction_filter_test: db/db_compaction_filter_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK)
db_dynamic_level_test: db/db_dynamic_level_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
db_tailing_iter_test: db/db_tailing_iter_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) db_tailing_iter_test: db/db_tailing_iter_test.o util/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)