From e587dbe03ab19fdf1986ca55b9fd66d1ec80e2ef Mon Sep 17 00:00:00 2001 From: Venkatesh Radhakrishnan Date: Wed, 14 Oct 2015 11:06:27 -0700 Subject: [PATCH] Move manual_compaction_test.cc from util to db Summary: manual_compaction_test.cc incorrectly in util. Moved to db. Test Plan: make check Reviewers: sdong Reviewed By: sdong Subscribers: dhruba Differential Revision: https://reviews.facebook.net/D48687 --- CMakeLists.txt | 2 +- Makefile | 2 +- {util => db}/manual_compaction_test.cc | 0 src.mk | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {util => db}/manual_compaction_test.cc (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15eb1817a..c8ad791e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,6 +302,7 @@ set(TESTS db/flush_job_test.cc db/listener_test.cc db/log_test.cc + db/manual_compaction_test.cc db/memtable_list_test.cc db/merge_test.cc db/merge_helper_test.cc @@ -342,7 +343,6 @@ set(TESTS util/heap_test.cc util/histogram_test.cc util/ldb_cmd_test.cc - util/manual_compaction_test.cc util/memenv_test.cc util/mock_env_test.cc util/options_test.cc diff --git a/Makefile b/Makefile index d4ccb0df8..b4ccc1dc5 100644 --- a/Makefile +++ b/Makefile @@ -916,7 +916,7 @@ optimistic_transaction_test: utilities/transactions/optimistic_transaction_test. mock_env_test : util/mock_env_test.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) -manual_compaction_test: util/manual_compaction_test.o $(LIBOBJECTS) $(TESTHARNESS) +manual_compaction_test: db/manual_compaction_test.o $(LIBOBJECTS) $(TESTHARNESS) $(AM_LINK) filelock_test: util/filelock_test.o $(LIBOBJECTS) $(TESTHARNESS) diff --git a/util/manual_compaction_test.cc b/db/manual_compaction_test.cc similarity index 100% rename from util/manual_compaction_test.cc rename to db/manual_compaction_test.cc diff --git a/src.mk b/src.mk index 39f9c1fa7..717bbae20 100644 --- a/src.mk +++ b/src.mk @@ -198,6 +198,7 @@ TEST_BENCH_SOURCES = \ db/listener_test.cc \ db/log_and_apply_bench.cc \ db/log_test.cc \ + db/manual_compaction_test.cc \ db/memtablerep_bench.cc \ db/merge_test.cc \ db/perf_context_test.cc \ @@ -252,7 +253,6 @@ TEST_BENCH_SOURCES = \ utilities/ttl/ttl_test.cc \ utilities/write_batch_with_index/write_batch_with_index_test.cc \ util/log_write_bench.cc \ - util/manual_compaction_test.cc \ util/memenv_test.cc \ util/mock_env_test.cc \ util/options_test.cc \