Move test related files under util/ to test_util/ (#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: https://github.com/facebook/rocksdb/pull/5377

Differential Revision: D15551366

Pulled By: siying

fbshipit-source-id: 0f5c8653832354ef8caa31749c0143815d719e2c

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

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)
 

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,

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

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 {
 

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 {
 

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 {
 

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 {

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 {
 

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 {
 

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) &&                                           \

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 {

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 {
 

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)

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 {

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 {
 

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 {
 

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 {

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;

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 {
 

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 {
 

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 {

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 {
 

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>

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 {
 

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 {
 

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");

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 {
 

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) {

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

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

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 {

db/db_options_test.cc

@@ -20,8 +20,8 @@
 #include "rocksdb/rate_limiter.h"
 #include "rocksdb/stats_history.h"
 #include "util/random.h"
-#include "util/sync_point.h"
-#include "util/testutil.h"
+#include "test_util/sync_point.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

db/db_range_del_test.cc

@@ -5,7 +5,7 @@
 
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
-#include "util/testutil.h"
+#include "test_util/testutil.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

db/db_secondary_test.cc

@@ -10,8 +10,8 @@
 #include "db/db_impl_secondary.h"
 #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 {
 

db/db_table_properties_test.cc

@@ -14,8 +14,8 @@
 #include "port/stack_trace.h"
 #include "rocksdb/db.h"
 #include "rocksdb/utilities/table_properties_collectors.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 
 #ifndef ROCKSDB_LITE
 

db/db_test.cc

@@ -63,9 +63,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"
 
 namespace rocksdb {

db/db_test_util.h

@@ -46,13 +46,13 @@
 #include "table/plain_table_factory.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/compression.h"
-#include "util/mock_time_env.h"
+#include "test_util/mock_time_env.h"
 #include "util/mutexlock.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 {

db/db_universal_compaction_test.cc

@@ -11,7 +11,7 @@
 #include "port/stack_trace.h"
 #if !defined(ROCKSDB_LITE)
 #include "rocksdb/utilities/table_properties_collectors.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

db/db_wal_test.cc

@@ -11,8 +11,8 @@
 #include "options/options_helper.h"
 #include "port/port.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 {
 class DBWALTest : public DBTestBase {

db/db_write_test.cc

@@ -12,9 +12,9 @@
 #include "db/write_thread.h"
 #include "port/port.h"
 #include "port/stack_trace.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 "test_util/sync_point.h"
 
 namespace rocksdb {
 

db/dbformat_test.cc

@@ -9,7 +9,7 @@
 
 #include "db/dbformat.h"
 #include "util/logging.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

db/deletefile_test.cc

@@ -21,9 +21,9 @@
 #include "rocksdb/env.h"
 #include "rocksdb/transaction_log.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"
 
 namespace rocksdb {
 

db/error_handler_test.cc

@@ -12,9 +12,9 @@
 #include "port/stack_trace.h"
 #include "rocksdb/perf_context.h"
 #include "rocksdb/sst_file_manager.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 {

db/external_sst_file_basic_test.cc

@@ -9,7 +9,7 @@
 #include "port/port.h"
 #include "port/stack_trace.h"
 #include "rocksdb/sst_file_writer.h"
-#include "util/testutil.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

db/external_sst_file_ingestion_job.cc

@@ -24,7 +24,7 @@
 #include "table/table_builder.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 {
 

db/external_sst_file_test.cc

@@ -11,8 +11,8 @@
 #include "port/port.h"
 #include "port/stack_trace.h"
 #include "rocksdb/sst_file_writer.h"
-#include "util/fault_injection_test_env.h"
-#include "util/testutil.h"
+#include "test_util/fault_injection_test_env.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

db/fault_injection_test.cc

@@ -21,12 +21,12 @@
 #include "rocksdb/env.h"
 #include "rocksdb/table.h"
 #include "rocksdb/write_batch.h"
-#include "util/fault_injection_test_env.h"
+#include "test_util/fault_injection_test_env.h"
 #include "util/logging.h"
 #include "util/mutexlock.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"
 
 namespace rocksdb {
 

db/file_indexer_test.cc

@@ -13,8 +13,8 @@
 #include "db/version_edit.h"
 #include "port/stack_trace.h"
 #include "rocksdb/comparator.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

db/filename_test.cc

@@ -12,7 +12,7 @@
 #include "db/dbformat.h"
 #include "port/port.h"
 #include "util/logging.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

db/flush_job.cc

@@ -51,7 +51,7 @@
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/stop_watch.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

db/flush_job_test.cc

@@ -15,8 +15,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"
 
 namespace rocksdb {
 

db/forward_iterator.cc

@@ -22,7 +22,7 @@
 #include "rocksdb/slice_transform.h"
 #include "table/merging_iterator.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

db/forward_iterator_bench.cc

@@ -35,7 +35,7 @@ int main() { return 0; }
 #include "rocksdb/status.h"
 #include "rocksdb/table.h"
 #include "util/gflags_compat.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 const int MAX_SHARDS = 100000;
 

db/listener_test.cc

@@ -29,9 +29,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"
 
 #ifndef ROCKSDB_LITE

db/log_test.cc

@@ -14,8 +14,8 @@
 #include "util/crc32c.h"
 #include "util/file_reader_writer.h"
 #include "util/random.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 namespace log {

db/manual_compaction_test.cc

@@ -12,7 +12,7 @@
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/write_batch.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 #include "port/port.h"
 
 using namespace rocksdb;

db/memtable_list.cc

@@ -24,7 +24,7 @@
 #include "table/merging_iterator.h"
 #include "util/coding.h"
 #include "util/log_buffer.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

db/memtable_list_test.cc

@@ -14,8 +14,8 @@
 #include "rocksdb/status.h"
 #include "rocksdb/write_buffer_manager.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 {
 

db/merge_helper_test.cc

@@ -10,8 +10,8 @@
 #include "db/merge_helper.h"
 #include "rocksdb/comparator.h"
 #include "util/coding.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 {

db/merge_test.cc

@@ -18,7 +18,7 @@
 #include "db/db_impl.h"
 #include "db/write_batch_internal.h"
 #include "utilities/merge_operators.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

db/obsolete_files_test.cc

@@ -21,9 +21,9 @@
 #include "rocksdb/env.h"
 #include "rocksdb/transaction_log.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"
 
 using std::cerr;
 using std::cout;

db/options_file_test.cc

@@ -10,7 +10,7 @@
 #include "db/db_test_util.h"
 #include "rocksdb/options.h"
 #include "rocksdb/table.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 class OptionsFileTest : public testing::Test {

db/perf_context_test.cc

@@ -19,7 +19,7 @@
 #include "rocksdb/slice_transform.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 #include "utilities/merge_operators.h"
 
 bool FLAGS_random_key = false;

db/plain_table_db_test.cc

@@ -33,8 +33,8 @@
 #include "util/logging.h"
 #include "util/mutexlock.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;

db/prefix_test.cc

@@ -31,7 +31,7 @@ int main() {
 #include "util/random.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 #include "utilities/merge_operators.h"
 
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;

db/range_del_aggregator_bench.cc

@@ -26,7 +26,7 @@ int main() {
 #include "util/coding.h"
 #include "util/random.h"
 #include "util/stop_watch.h"
-#include "util/testutil.h"
+#include "test_util/testutil.h"
 
 #include "util/gflags_compat.h"
 

db/range_del_aggregator_test.cc

@@ -12,7 +12,7 @@
 #include "db/db_test_util.h"
 #include "db/dbformat.h"
 #include "db/range_tombstone_fragmenter.h"
-#include "util/testutil.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

db/range_tombstone_fragmenter_test.cc

@@ -7,7 +7,7 @@
 
 #include "db/db_test_util.h"
 #include "rocksdb/comparator.h"
-#include "util/testutil.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

db/table_cache.cc

@@ -25,7 +25,7 @@
 #include "util/coding.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 {
 

db/table_properties_collector_test.cc

@@ -20,8 +20,8 @@
 #include "table/table_builder.h"
 #include "util/coding.h"
 #include "util/file_reader_writer.h"
-#include "util/testharness.h"
-#include "util/testutil.h"
+#include "test_util/testharness.h"
+#include "test_util/testutil.h"
 
 namespace rocksdb {
 

db/version_builder_test.cc

@@ -8,8 +8,8 @@
 #include "db/version_set.h"
 #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 {
 

db/version_edit.cc

@@ -14,7 +14,7 @@
 #include "util/coding.h"
 #include "util/event_logger.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

db/version_edit_test.cc

@@ -9,8 +9,8 @@
 
 #include "db/version_edit.h"
 #include "util/coding.h"
-#include "util/sync_point.h"
-#include "util/testharness.h"
+#include "test_util/sync_point.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

db/version_set.cc

@@ -52,7 +52,7 @@
 #include "util/file_reader_writer.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 #include "util/user_comparator_wrapper.h"
 
 namespace rocksdb {

db/version_set_test.cc

@@ -12,8 +12,8 @@
 #include "table/mock_table.h"
 #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 {
 

db/wal_manager.cc

@@ -34,7 +34,7 @@
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

db/wal_manager_test.cc

@@ -21,8 +21,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"
 
 namespace rocksdb {
 

db/write_batch_test.cc

@@ -19,7 +19,7 @@
 #include "rocksdb/write_buffer_manager.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

db/write_callback_test.cc

@@ -17,8 +17,8 @@
 #include "rocksdb/write_batch.h"
 #include "port/port.h"
 #include "util/random.h"
-#include "util/sync_point.h"
-#include "util/testharness.h"
+#include "test_util/sync_point.h"
+#include "test_util/testharness.h"
 
 using std::string;
 

db/write_controller_test.cc

@@ -8,7 +8,7 @@
 #include "db/write_controller.h"
 
 #include "rocksdb/env.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

db/write_thread.cc

@@ -10,7 +10,7 @@
 #include "monitoring/perf_context_imp.h"
 #include "port/port.h"
 #include "util/random.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

env/env_basic_test.cc

@@ -12,7 +12,7 @@
 #include "env/mock_env.h"
 #include "rocksdb/env.h"
 #include "rocksdb/utilities/object_registry.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

env/env_posix.cc

@@ -54,7 +54,7 @@
 #include "util/logging.h"
 #include "util/random.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 #include "util/thread_local.h"
 #include "util/threadpool_imp.h"
 

env/env_test.cc

@@ -44,9 +44,9 @@
 #include "util/log_buffer.h"
 #include "util/mutexlock.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"
 
 #ifdef OS_LINUX
 static const size_t kPageSize = sysconf(_SC_PAGESIZE);

env/io_posix.cc

@@ -33,7 +33,7 @@
 #include "rocksdb/slice.h"
 #include "util/coding.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 #if defined(OS_LINUX) && !defined(F_SET_RW_HINT)
 #define F_LINUX_SPECIFIC_BASE 1024

env/mock_env_test.cc

@@ -10,7 +10,7 @@
 #include <string>
 
 #include "rocksdb/env.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

env/posix_logger.h

@@ -27,7 +27,7 @@
 #include "env/io_posix.h"
 #include "monitoring/iostats_context_imp.h"
 #include "rocksdb/env.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

file/delete_scheduler.cc

@@ -15,7 +15,7 @@
 #include "rocksdb/env.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

file/delete_scheduler_test.cc

@@ -17,9 +17,9 @@
 #include "rocksdb/env.h"
 #include "rocksdb/options.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"
 
 #ifndef ROCKSDB_LITE
 

file/filename.cc

@@ -21,7 +21,7 @@
 #include "util/logging.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

file/sst_file_manager_impl.cc

@@ -17,7 +17,7 @@
 #include "rocksdb/env.h"
 #include "rocksdb/sst_file_manager.h"
 #include "util/mutexlock.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 

java/rocksjni/write_batch_test.cc

@@ -23,7 +23,7 @@
 #include "rocksjni/portal.h"
 #include "table/scoped_arena_iterator.h"
 #include "util/string_util.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 /*
  * Class:     org_rocksdb_WriteBatchTest

memtable/inlineskiplist_test.cc

@@ -14,7 +14,7 @@
 #include "util/concurrent_arena.h"
 #include "util/hash.h"
 #include "util/random.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

memtable/memtablerep_bench.cc

@@ -39,7 +39,7 @@ int main() {
 #include "util/gflags_compat.h"
 #include "util/mutexlock.h"
 #include "util/stop_watch.h"
-#include "util/testutil.h"
+#include "test_util/testutil.h"
 
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;
 using GFLAGS_NAMESPACE::RegisterFlagValidator;

memtable/skiplist_test.cc

@@ -13,7 +13,7 @@
 #include "util/arena.h"
 #include "util/hash.h"
 #include "util/random.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

memtable/write_buffer_manager_test.cc

@@ -8,7 +8,7 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
 #include "rocksdb/write_buffer_manager.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

monitoring/histogram_test.cc

@@ -7,7 +7,7 @@
 
 #include "monitoring/histogram.h"
 #include "monitoring/histogram_windowing.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {
 

monitoring/instrumented_mutex.cc

@@ -6,7 +6,7 @@
 #include "monitoring/instrumented_mutex.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/thread_status_util.h"
-#include "util/sync_point.h"
+#include "test_util/sync_point.h"
 
 namespace rocksdb {
 namespace {

monitoring/iostats_context_test.cc

@@ -4,7 +4,7 @@
 //  (found in the LICENSE.Apache file in the root directory).
 
 #include "rocksdb/iostats_context.h"
-#include "util/testharness.h"
+#include "test_util/testharness.h"
 
 namespace rocksdb {