XiaoMi · hycdong · Jul 14, 2020 · Jul 14, 2020 · Jul 14, 2020 · Jul 14, 2020
diff --git a/src/aio/CMakeLists.txt b/src/aio/CMakeLists.txt
@@ -16,4 +16,4 @@ set(MY_BINPLACES "")
 
 dsn_add_static_library()
 
-add_subdirectory(tests)
+add_subdirectory(test)
diff --git a/src/aio/tests/CMakeLists.txt → src/aio/test/CMakeLists.txt b/src/aio/tests/CMakeLists.txt → src/aio/test/CMakeLists.txt
diff --git a/src/aio/tests/aio.cpp → src/aio/test/aio.cpp b/src/aio/tests/aio.cpp → src/aio/test/aio.cpp
diff --git a/src/aio/tests/clear.sh → src/aio/test/clear.sh b/src/aio/tests/clear.sh → src/aio/test/clear.sh
diff --git a/src/aio/tests/config.ini → src/aio/test/config.ini b/src/aio/tests/config.ini → src/aio/test/config.ini
diff --git a/src/aio/tests/copy_source.txt → src/aio/test/copy_source.txt b/src/aio/tests/copy_source.txt → src/aio/test/copy_source.txt
diff --git a/src/aio/tests/main.cpp → src/aio/test/main.cpp b/src/aio/tests/main.cpp → src/aio/test/main.cpp
diff --git a/src/aio/tests/run.sh → src/aio/test/run.sh b/src/aio/tests/run.sh → src/aio/test/run.sh
diff --git a/src/failure_detector/CMakeLists.txt b/src/failure_detector/CMakeLists.txt
@@ -16,5 +16,5 @@ set(MY_BINPLACES "")
 
 dsn_add_static_library()
 
-add_subdirectory(tests)
+add_subdirectory(test)
 
diff --git a/src/failure_detector/tests/CMakeLists.txt → src/failure_detector/test/CMakeLists.txt b/src/failure_detector/tests/CMakeLists.txt → src/failure_detector/test/CMakeLists.txt
diff --git a/src/failure_detector/tests/clear.sh → src/failure_detector/test/clear.sh b/src/failure_detector/tests/clear.sh → src/failure_detector/test/clear.sh
diff --git a/src/failure_detector/tests/config-test.ini → src/failure_detector/test/config-test.ini b/src/failure_detector/tests/config-test.ini → src/failure_detector/test/config-test.ini
diff --git a/...or/tests/config-whitelist-test-failed.ini → ...tor/test/config-whitelist-test-failed.ini b/...or/tests/config-whitelist-test-failed.ini → ...tor/test/config-whitelist-test-failed.ini
diff --git a/..._detector/tests/config-whitelist-test.ini → ...e_detector/test/config-whitelist-test.ini b/..._detector/tests/config-whitelist-test.ini → ...e_detector/test/config-whitelist-test.ini
diff --git a/...ilure_detector/tests/failure_detector.cpp → ...ailure_detector/test/failure_detector.cpp b/...ilure_detector/tests/failure_detector.cpp → ...ailure_detector/test/failure_detector.cpp
diff --git a/src/failure_detector/tests/gtest.filter → src/failure_detector/test/gtest.filter b/src/failure_detector/tests/gtest.filter → src/failure_detector/test/gtest.filter
diff --git a/src/failure_detector/tests/main.cpp → src/failure_detector/test/main.cpp b/src/failure_detector/tests/main.cpp → src/failure_detector/test/main.cpp
diff --git a/src/failure_detector/tests/run.sh → src/failure_detector/test/run.sh b/src/failure_detector/tests/run.sh → src/failure_detector/test/run.sh
diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
@@ -34,4 +34,4 @@ set(MY_BINPLACES "")
 
 dsn_add_shared_library()
 
-add_subdirectory(tests)
+add_subdirectory(test)
diff --git a/src/meta/tests/CMakeLists.txt → src/meta/test/CMakeLists.txt b/src/meta/tests/CMakeLists.txt → src/meta/test/CMakeLists.txt
diff --git a/src/meta/tests/backup_test.cpp → src/meta/test/backup_test.cpp b/src/meta/tests/backup_test.cpp → src/meta/test/backup_test.cpp
@@ -5,7 +5,7 @@
 #include "meta/meta_backup_service.h"
 #include "meta/meta_service.h"
 #include "meta_service_test_app.h"
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 
 namespace dsn {
 namespace replication {

diff --git a/...a/tests/balancer_simulator/CMakeLists.txt → ...ta/test/balancer_simulator/CMakeLists.txt b/...a/tests/balancer_simulator/CMakeLists.txt → ...ta/test/balancer_simulator/CMakeLists.txt
diff --git a/...balancer_simulator/balancer_simulator.cpp → ...balancer_simulator/balancer_simulator.cpp b/...balancer_simulator/balancer_simulator.cpp → ...balancer_simulator/balancer_simulator.cpp
@@ -4,7 +4,7 @@
 #include "meta/meta_data.h"
 #include "meta/server_load_balancer.h"
 #include "meta/greedy_load_balancer.h"
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 
 using namespace dsn::replication;
 

diff --git a/src/meta/tests/balancer_validator.cpp → src/meta/test/balancer_validator.cpp b/src/meta/tests/balancer_validator.cpp → src/meta/test/balancer_validator.cpp
@@ -11,7 +11,7 @@
 #include "meta/server_load_balancer.h"
 #include "meta/greedy_load_balancer.h"
 
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 
 #include "meta_service_test_app.h"
 

diff --git a/src/meta/tests/clear.sh → src/meta/test/clear.sh b/src/meta/tests/clear.sh → src/meta/test/clear.sh
diff --git a/src/meta/tests/config-ddl-test.ini → src/meta/test/config-ddl-test.ini b/src/meta/tests/config-ddl-test.ini → src/meta/test/config-ddl-test.ini
diff --git a/src/meta/tests/config-test.ini → src/meta/test/config-test.ini b/src/meta/tests/config-test.ini → src/meta/test/config-test.ini
diff --git a/src/meta/tests/data_definition_test.cpp → src/meta/test/data_definition_test.cpp b/src/meta/tests/data_definition_test.cpp → src/meta/test/data_definition_test.cpp
@@ -9,7 +9,7 @@
 #include "meta/server_state.h"
 #include "meta/meta_server_failure_detector.h"
 #include "meta/server_load_balancer.h"
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 
 #include "meta_service_test_app.h"
 

diff --git a/src/meta/tests/dump_file.cpp → src/meta/test/dump_file.cpp b/src/meta/tests/dump_file.cpp → src/meta/test/dump_file.cpp
diff --git a/src/meta/tests/duplication_info_test.cpp → src/meta/test/duplication_info_test.cpp b/src/meta/tests/duplication_info_test.cpp → src/meta/test/duplication_info_test.cpp
diff --git a/src/meta/tests/json_compacity.cpp → src/meta/test/json_compacity.cpp b/src/meta/tests/json_compacity.cpp → src/meta/test/json_compacity.cpp
diff --git a/src/meta/tests/main.cpp → src/meta/test/main.cpp b/src/meta/tests/main.cpp → src/meta/test/main.cpp
diff --git a/src/meta/tests/meta_app_envs_test.cpp → src/meta/test/meta_app_envs_test.cpp b/src/meta/tests/meta_app_envs_test.cpp → src/meta/test/meta_app_envs_test.cpp
diff --git a/...eta/tests/meta_bulk_load_service_test.cpp → ...meta/test/meta_bulk_load_service_test.cpp b/...eta/tests/meta_bulk_load_service_test.cpp → ...meta/test/meta_bulk_load_service_test.cpp
diff --git a/src/meta/tests/meta_data.cpp → src/meta/test/meta_data.cpp b/src/meta/tests/meta_data.cpp → src/meta/test/meta_data.cpp
diff --git a/...a/tests/meta_duplication_service_test.cpp → ...ta/test/meta_duplication_service_test.cpp b/...a/tests/meta_duplication_service_test.cpp → ...ta/test/meta_duplication_service_test.cpp
@@ -32,7 +32,7 @@
 #include "meta/meta_server_failure_detector.h"
 #include "meta/meta_http_service.h"
 #include "meta/duplication/meta_duplication_service.h"
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 
 #include "meta_service_test_app.h"
 #include "meta_test_base.h"

diff --git a/src/meta/tests/meta_http_service_test.cpp → src/meta/test/meta_http_service_test.cpp b/src/meta/tests/meta_http_service_test.cpp → src/meta/test/meta_http_service_test.cpp
diff --git a/src/meta/tests/meta_load_balance_test.cpp → src/meta/test/meta_load_balance_test.cpp b/src/meta/tests/meta_load_balance_test.cpp → src/meta/test/meta_load_balance_test.cpp
@@ -10,7 +10,7 @@
 #include "meta/server_state.h"
 #include "meta/meta_server_failure_detector.h"
 #include "meta/greedy_load_balancer.h"
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 #include "meta_test_base.h"
 #include "meta_service_test_app.h"
 

diff --git a/src/meta/tests/meta_service_test.cpp → src/meta/test/meta_service_test.cpp b/src/meta/tests/meta_service_test.cpp → src/meta/test/meta_service_test.cpp
diff --git a/src/meta/tests/meta_service_test_app.h → src/meta/test/meta_service_test_app.h b/src/meta/tests/meta_service_test_app.h → src/meta/test/meta_service_test_app.h
diff --git a/src/meta/tests/meta_split_service_test.cpp → src/meta/test/meta_split_service_test.cpp b/src/meta/tests/meta_split_service_test.cpp → src/meta/test/meta_split_service_test.cpp
diff --git a/src/meta/tests/meta_state/CMakeLists.txt → src/meta/test/meta_state/CMakeLists.txt b/src/meta/tests/meta_state/CMakeLists.txt → src/meta/test/meta_state/CMakeLists.txt
diff --git a/src/meta/tests/meta_state/clear.cmd → src/meta/test/meta_state/clear.cmd b/src/meta/tests/meta_state/clear.cmd → src/meta/test/meta_state/clear.cmd
diff --git a/src/meta/tests/meta_state/clear.sh → src/meta/test/meta_state/clear.sh b/src/meta/tests/meta_state/clear.sh → src/meta/test/meta_state/clear.sh
diff --git a/src/meta/tests/meta_state/config-test.ini → src/meta/test/meta_state/config-test.ini b/src/meta/tests/meta_state/config-test.ini → src/meta/test/meta_state/config-test.ini
diff --git a/src/meta/tests/meta_state/gtest.filter → src/meta/test/meta_state/gtest.filter b/src/meta/tests/meta_state/gtest.filter → src/meta/test/meta_state/gtest.filter
diff --git a/src/meta/tests/meta_state/main.cpp → src/meta/test/meta_state/main.cpp b/src/meta/tests/meta_state/main.cpp → src/meta/test/meta_state/main.cpp
diff --git a/...a/tests/meta_state/meta_state_service.cpp → ...ta/test/meta_state/meta_state_service.cpp b/...a/tests/meta_state/meta_state_service.cpp → ...ta/test/meta_state/meta_state_service.cpp
diff --git a/src/meta/tests/meta_state/run.sh → src/meta/test/meta_state/run.sh b/src/meta/tests/meta_state/run.sh → src/meta/test/meta_state/run.sh
diff --git a/...a/tests/meta_state_service_utils_test.cpp → ...ta/test/meta_state_service_utils_test.cpp b/...a/tests/meta_state_service_utils_test.cpp → ...ta/test/meta_state_service_utils_test.cpp
diff --git a/src/meta/tests/meta_test_base.h → src/meta/test/meta_test_base.h b/src/meta/tests/meta_test_base.h → src/meta/test/meta_test_base.h
@@ -8,7 +8,7 @@
 #include "meta/meta_server_failure_detector.h"
 #include "meta/meta_split_service.h"
 #include "meta/meta_bulk_load_service.h"
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 
 #include "meta_service_test_app.h"
 

diff --git a/src/meta/tests/misc/misc.cpp → src/meta/test/misc/misc.cpp b/src/meta/tests/misc/misc.cpp → src/meta/test/misc/misc.cpp
diff --git a/src/meta/tests/misc/misc.h → src/meta/test/misc/misc.h b/src/meta/tests/misc/misc.h → src/meta/test/misc/misc.h
diff --git a/src/meta/tests/run.sh → src/meta/test/run.sh b/src/meta/tests/run.sh → src/meta/test/run.sh
diff --git a/src/meta/tests/server_state_test.cpp → src/meta/test/server_state_test.cpp b/src/meta/tests/server_state_test.cpp → src/meta/test/server_state_test.cpp
diff --git a/src/meta/tests/state_sync_test.cpp → src/meta/test/state_sync_test.cpp b/src/meta/tests/state_sync_test.cpp → src/meta/test/state_sync_test.cpp
@@ -9,7 +9,7 @@
 #include "meta/meta_service.h"
 #include "meta/server_state.h"
 
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 
 #include "meta_service_test_app.h"
 

diff --git a/src/meta/tests/suite1 → src/meta/test/suite1 b/src/meta/tests/suite1 → src/meta/test/suite1
diff --git a/src/meta/tests/suite2 → src/meta/test/suite2 b/src/meta/tests/suite2 → src/meta/test/suite2
diff --git a/src/meta/tests/update_configuration_test.cpp → src/meta/test/update_configuration_test.cpp b/src/meta/tests/update_configuration_test.cpp → src/meta/test/update_configuration_test.cpp
@@ -8,7 +8,7 @@
 #include "meta/server_state.h"
 #include "meta/greedy_load_balancer.h"
 #include "meta/meta_server_failure_detector.h"
-#include "meta/tests/misc/misc.h"
+#include "meta/test/misc/misc.h"
 
 #include "meta_service_test_app.h"
 

diff --git a/src/perf_counter/CMakeLists.txt b/src/perf_counter/CMakeLists.txt
@@ -14,4 +14,4 @@ set(MY_BINPLACES "")
 
 dsn_add_object()
 
-add_subdirectory(tests)
+add_subdirectory(test)
diff --git a/src/perf_counter/tests/CMakeLists.txt → src/perf_counter/test/CMakeLists.txt b/src/perf_counter/tests/CMakeLists.txt → src/perf_counter/test/CMakeLists.txt
diff --git a/src/perf_counter/tests/clear.sh → src/perf_counter/test/clear.sh b/src/perf_counter/tests/clear.sh → src/perf_counter/test/clear.sh
diff --git a/src/perf_counter/tests/main.cpp → src/perf_counter/test/main.cpp b/src/perf_counter/tests/main.cpp → src/perf_counter/test/main.cpp
diff --git a/src/perf_counter/tests/perf_counter_test.cpp → src/perf_counter/test/perf_counter_test.cpp b/src/perf_counter/tests/perf_counter_test.cpp → src/perf_counter/test/perf_counter_test.cpp
diff --git a/...perf_counter/tests/perf_counters_test.cpp → src/perf_counter/test/perf_counters_test.cpp b/...perf_counter/tests/perf_counters_test.cpp → src/perf_counter/test/perf_counters_test.cpp
diff --git a/src/perf_counter/tests/run.sh → src/perf_counter/test/run.sh b/src/perf_counter/tests/run.sh → src/perf_counter/test/run.sh
diff --git a/src/zookeeper/CMakeLists.txt b/src/zookeeper/CMakeLists.txt
@@ -17,4 +17,4 @@ set(MY_BINPLACES "")
 
 dsn_add_static_library()
 
-add_subdirectory(tests)
+add_subdirectory(test)
diff --git a/src/zookeeper/tests/CMakeLists.txt → src/zookeeper/test/CMakeLists.txt b/src/zookeeper/tests/CMakeLists.txt → src/zookeeper/test/CMakeLists.txt
diff --git a/src/zookeeper/tests/clear.sh → src/zookeeper/test/clear.sh b/src/zookeeper/tests/clear.sh → src/zookeeper/test/clear.sh
diff --git a/src/zookeeper/tests/config-test.ini → src/zookeeper/test/config-test.ini b/src/zookeeper/tests/config-test.ini → src/zookeeper/test/config-test.ini
diff --git a/...eper/tests/distributed_lock_zookeeper.cpp → ...eeper/test/distributed_lock_zookeeper.cpp b/...eper/tests/distributed_lock_zookeeper.cpp → ...eeper/test/distributed_lock_zookeeper.cpp
diff --git a/src/zookeeper/tests/gtest.filter → src/zookeeper/test/gtest.filter b/src/zookeeper/tests/gtest.filter → src/zookeeper/test/gtest.filter
diff --git a/src/zookeeper/tests/main.cpp → src/zookeeper/test/main.cpp b/src/zookeeper/tests/main.cpp → src/zookeeper/test/main.cpp
diff --git a/src/zookeeper/tests/run.sh → src/zookeeper/test/run.sh b/src/zookeeper/tests/run.sh → src/zookeeper/test/run.sh