Move test related files under util/ to test_util/ (facebook#5377)

Summary: There are too many types of files under util/. Some test related files don't belong to there or just are just loosely related. Mo ve them to a new directory test_util/, so that util/ is cleaner. Pull Request resolved: facebook#5377 Differential Revision: D15551366 Pulled By: siying fbshipit-source-id: 0f5c8653832354ef8caa31749c0143815d719e2c
mambaru · May 30, 2019 · e9e0101 · e9e0101
1 parent a984040
commit e9e0101
Show file tree

Hide file tree

Showing 203 changed files with 322 additions and 322 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -600,6 +600,10 @@ set(SOURCES
         table/sst_file_writer.cc
         table/table_properties.cc
         table/two_level_iterator.cc
+        test_util/sync_point.cc
+        test_util/sync_point_impl.cc
+        test_util/testutil.cc
+        test_util/transaction_test_util.cc
         tools/db_bench_tool.cc
         tools/dump/db_dump_tool.cc
         tools/ldb_cmd.cc
@@ -629,13 +633,9 @@ set(SOURCES
         util/slice.cc
         util/status.cc
         util/string_util.cc
-        util/sync_point.cc
-        util/sync_point_impl.cc
-        util/testutil.cc
         util/thread_local.cc
         util/threadpool_imp.cc
         util/trace_replay.cc
-        util/transaction_test_util.cc
         util/xxhash.cc
         utilities/backupable/backupable_db.cc
         utilities/blob_db/blob_compaction_filter.cc
@@ -1006,7 +1006,7 @@ if(WITH_TESTS)
     tools/db_bench.cc
     table/table_reader_bench.cc
     utilities/persistent_cache/hash_table_bench.cc)
-  add_library(testharness OBJECT util/testharness.cc)
+  add_library(testharness OBJECT test_util/testharness.cc)
   foreach(sourcefile ${BENCHMARKS})
     get_filename_component(exename ${sourcefile} NAME_WE)
     add_executable(${exename}${ARTIFACT_SUFFIX} ${sourcefile}
@@ -1020,7 +1020,7 @@ if(WITH_TESTS)
       db/db_test_util.cc
       monitoring/thread_status_updater_debug.cc
       table/mock_table.cc
-      util/fault_injection_test_env.cc
+      test_util/fault_injection_test_env.cc
       utilities/cassandra/test_utils.cc
   )
   # test utilities are only build in debug

diff --git a/Makefile b/Makefile
@@ -404,8 +404,8 @@ LIBOBJECTS += $(TOOL_LIB_SOURCES:.cc=.o)
 MOCKOBJECTS = $(MOCK_LIB_SOURCES:.cc=.o)
 
 GTEST = $(GTEST_DIR)/gtest/gtest-all.o
-TESTUTIL = ./util/testutil.o
-TESTHARNESS = ./util/testharness.o $(TESTUTIL) $(MOCKOBJECTS) $(GTEST)
+TESTUTIL = ./test_util/testutil.o
+TESTHARNESS = ./test_util/testharness.o $(TESTUTIL) $(MOCKOBJECTS) $(GTEST)
 VALGRIND_ERROR = 2
 VALGRIND_VER := $(join $(VALGRIND_VER),valgrind)
 

diff --git a/TARGETS b/TARGETS
@@ -207,6 +207,9 @@ cpp_library(
         "table/sst_file_writer.cc",
         "table/table_properties.cc",
         "table/two_level_iterator.cc",
+        "test_util/sync_point.cc",
+        "test_util/sync_point_impl.cc",
+        "test_util/transaction_test_util.cc",
         "tools/dump/db_dump_tool.cc",
         "tools/ldb_cmd.cc",
         "tools/ldb_tool.cc",
@@ -235,12 +238,9 @@ cpp_library(
         "util/slice.cc",
         "util/status.cc",
         "util/string_util.cc",
-        "util/sync_point.cc",
-        "util/sync_point_impl.cc",
         "util/thread_local.cc",
         "util/threadpool_imp.cc",
         "util/trace_replay.cc",
-        "util/transaction_test_util.cc",
         "util/xxhash.cc",
         "utilities/backupable/backupable_db.cc",
         "utilities/blob_db/blob_compaction_filter.cc",
@@ -309,10 +309,10 @@ cpp_library(
     srcs = [
         "db/db_test_util.cc",
         "table/mock_table.cc",
+        "test_util/fault_injection_test_env.cc",
+        "test_util/testharness.cc",
+        "test_util/testutil.cc",
         "tools/trace_analyzer_tool.cc",
-        "util/fault_injection_test_env.cc",
-        "util/testharness.cc",
-        "util/testutil.cc",
         "utilities/cassandra/test_utils.cc",
     ],
     auto_headers = AutoHeaders.RECURSIVE_GLOB,
@@ -326,9 +326,9 @@ cpp_library(
 cpp_library(
     name = "rocksdb_tools_lib",
     srcs = [
+        "test_util/testutil.cc",
         "tools/db_bench_tool.cc",
         "tools/trace_analyzer_tool.cc",
-        "util/testutil.cc",
     ],
     auto_headers = AutoHeaders.RECURSIVE_GLOB,
     arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,

diff --git a/buckifier/buckify_rocksdb.py b/buckifier/buckify_rocksdb.py
@@ -118,7 +118,7 @@ def generate_targets(repo_path):
         "rocksdb_tools_lib",
         src_mk.get("BENCH_LIB_SOURCES", []) +
         src_mk.get("ANALYZER_LIB_SOURCES", []) +
-        ["util/testutil.cc"],
+        ["test_util/testutil.cc"],
         [":rocksdb_lib"])
 
     # test for every test we found in the Makefile

diff --git a/cache/cache_test.cc b/cache/cache_test.cc
@@ -18,7 +18,7 @@
 #include "cache/lru_cache.h"
 #include "util/coding.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

diff --git a/cache/lru_cache_test.cc b/cache/lru_cache_test.cc
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 #include "port/port.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

diff --git a/db/builder.cc b/db/builder.cc
@@ -34,7 +34,7 @@
 #include "table/internal_iterator.h"
 #include "util/file_reader_writer.h"
 #include "util/stop_watch.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/column_family_test.cc b/db/column_family_test.cc
@@ -21,11 +21,11 @@
 #include "rocksdb/env.h"
 #include "rocksdb/iterator.h"
 #include "util/coding.h"
-#include "util/fault_injection_test_env.h"
+#include "test_util/fault_injection_test_env.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/sync_point.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

diff --git a/db/compact_files_test.cc b/db/compact_files_test.cc
@@ -15,8 +15,8 @@
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
-#include "util/testharness.h"
+#include "test_util/sync_point.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction.cc b/db/compaction.cc
@@ -19,7 +19,7 @@
 #include "db/column_family.h"
 #include "rocksdb/compaction_filter.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction_iterator.cc b/db/compaction_iterator.cc
@@ -9,7 +9,7 @@
 #include "port/likely.h"
 #include "rocksdb/listener.h"
 #include "table/internal_iterator.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 #define DEFINITELY_IN_SNAPSHOT(seq, snapshot)                       \
   ((seq) <= (snapshot) &&                                           \

diff --git a/db/compaction_iterator_test.cc b/db/compaction_iterator_test.cc
@@ -10,8 +10,8 @@
 
 #include "port/port.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

diff --git a/db/compaction_job.cc b/db/compaction_job.cc
@@ -61,7 +61,7 @@
 #include "util/random.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction_job_stats_test.cc b/db/compaction_job_stats_test.cc
@@ -58,9 +58,9 @@
 #include "util/mutexlock.h"
 #include "util/rate_limiter.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/sync_point.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
 #if !defined(IOS_CROSS_COMPILE)

diff --git a/db/compaction_job_test.cc b/db/compaction_job_test.cc
@@ -27,8 +27,8 @@
 #include "table/mock_table.h"
 #include "util/file_reader_writer.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

diff --git a/db/compaction_picker.cc b/db/compaction_picker.cc
@@ -25,7 +25,7 @@
 #include "util/log_buffer.h"
 #include "util/random.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction_picker_test.cc b/db/compaction_picker_test.cc
@@ -14,8 +14,8 @@
 
 #include "util/logging.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction_picker_universal.cc b/db/compaction_picker_universal.cc
@@ -25,7 +25,7 @@
 #include "util/log_buffer.h"
 #include "util/random.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 namespace {

diff --git a/db/comparator_db_test.cc b/db/comparator_db_test.cc
@@ -12,8 +12,8 @@
 #include "util/hash.h"
 #include "util/kv_map.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
 using std::unique_ptr;

diff --git a/db/corruption_test.cc b/db/corruption_test.cc
@@ -28,8 +28,8 @@
 #include "table/block_based_table_builder.h"
 #include "table/meta_blocks.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

diff --git a/db/cuckoo_table_db_test.cc b/db/cuckoo_table_db_test.cc
@@ -12,8 +12,8 @@
 #include "table/cuckoo_table_reader.h"
 #include "table/meta_blocks.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

diff --git a/db/db_basic_test.cc b/db/db_basic_test.cc
@@ -10,9 +10,9 @@
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
 #include "rocksdb/perf_context.h"
-#include "util/fault_injection_test_env.h"
+#include "test_util/fault_injection_test_env.h"
 #if !defined(ROCKSDB_LITE)
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 #endif
 
 namespace rocksdb {

diff --git a/db/db_compaction_test.cc b/db/db_compaction_test.cc
@@ -14,8 +14,8 @@
 #include "rocksdb/experimental.h"
 #include "rocksdb/utilities/convenience.h"
 #include "util/concurrent_task_limiter_impl.h"
-#include "util/fault_injection_test_env.h"
-#include "util/sync_point.h"
+#include "test_util/fault_injection_test_env.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/db_encryption_test.cc b/db/db_encryption_test.cc
@@ -7,7 +7,7 @@
 #include "port/stack_trace.h"
 #include "rocksdb/perf_context.h"
 #if !defined(ROCKSDB_LITE)
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 #endif
 #include <iostream>
 #include <string>

diff --git a/db/db_filesnapshot.cc b/db/db_filesnapshot.cc
@@ -23,7 +23,7 @@
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "util/mutexlock.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/db_flush_test.cc b/db/db_flush_test.cc
@@ -9,8 +9,8 @@
 
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
-#include "util/fault_injection_test_env.h"
-#include "util/sync_point.h"
+#include "test_util/fault_injection_test_env.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/db_impl.cc b/db/db_impl.cc
@@ -97,7 +97,7 @@
 #include "util/mutexlock.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 const std::string kDefaultColumnFamilyName("default");

diff --git a/db/db_impl_compaction_flush.cc b/db/db_impl_compaction_flush.cc
@@ -22,7 +22,7 @@
 #include "monitoring/thread_status_updater.h"
 #include "monitoring/thread_status_util.h"
 #include "util/concurrent_task_limiter_impl.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

diff --git a/db/db_impl_open.cc b/db/db_impl_open.cc
@@ -20,7 +20,7 @@
 #include "rocksdb/wal_filter.h"
 #include "table/block_based_table_factory.h"
 #include "util/rate_limiter.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 Options SanitizeOptions(const std::string& dbname, const Options& src) {

diff --git a/db/db_impl_write.cc b/db/db_impl_write.cc
@@ -16,7 +16,7 @@
 #include "db/event_helpers.h"
 #include "monitoring/perf_context_imp.h"
 #include "options/options_helper.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 // Convenience methods

diff --git a/db/db_iter_stress_test.cc b/db/db_iter_stress_test.cc
@@ -10,7 +10,7 @@
 #include "rocksdb/slice.h"
 #include "util/random.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 #include "utilities/merge_operators.h"
 
 #ifdef GFLAGS

diff --git a/db/db_iter_test.cc b/db/db_iter_test.cc
@@ -18,8 +18,8 @@
 #include "table/iterator_wrapper.h"
 #include "table/merging_iterator.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
-#include "util/testharness.h"
+#include "test_util/sync_point.h"
+#include "test_util/testharness.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {