ctdb-tests: Move cunit tests to UNIT/ subdirectory

The UNIT subdirectory directory will contain all unit tests.  Use an
uppercase name to avoid conflicts with source code subdirectories.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/cunit/cluster_mutex_001.sh b/ctdb/tests/UNIT/cunit/cluster_mutex_001.sh
similarity index 100%
rename from ctdb/tests/cunit/cluster_mutex_001.sh
rename to ctdb/tests/UNIT/cunit/cluster_mutex_001.sh

diff --git a/ctdb/tests/cunit/cluster_mutex_002.sh b/ctdb/tests/UNIT/cunit/cluster_mutex_002.sh
similarity index 100%
rename from ctdb/tests/cunit/cluster_mutex_002.sh
rename to ctdb/tests/UNIT/cunit/cluster_mutex_002.sh

diff --git a/ctdb/tests/cunit/cluster_mutex_003.sh b/ctdb/tests/UNIT/cunit/cluster_mutex_003.sh
similarity index 100%
rename from ctdb/tests/cunit/cluster_mutex_003.sh
rename to ctdb/tests/UNIT/cunit/cluster_mutex_003.sh

diff --git a/ctdb/tests/cunit/cmdline_test_001.sh b/ctdb/tests/UNIT/cunit/cmdline_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/cmdline_test_001.sh
rename to ctdb/tests/UNIT/cunit/cmdline_test_001.sh

diff --git a/ctdb/tests/cunit/comm_test_001.sh b/ctdb/tests/UNIT/cunit/comm_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/comm_test_001.sh
rename to ctdb/tests/UNIT/cunit/comm_test_001.sh

diff --git a/ctdb/tests/cunit/comm_test_002.sh b/ctdb/tests/UNIT/cunit/comm_test_002.sh
similarity index 100%
rename from ctdb/tests/cunit/comm_test_002.sh
rename to ctdb/tests/UNIT/cunit/comm_test_002.sh

diff --git a/ctdb/tests/cunit/conf_test_001.sh b/ctdb/tests/UNIT/cunit/conf_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/conf_test_001.sh
rename to ctdb/tests/UNIT/cunit/conf_test_001.sh

diff --git a/ctdb/tests/cunit/config_test_001.sh b/ctdb/tests/UNIT/cunit/config_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/config_test_001.sh
rename to ctdb/tests/UNIT/cunit/config_test_001.sh

diff --git a/ctdb/tests/cunit/config_test_002.sh b/ctdb/tests/UNIT/cunit/config_test_002.sh
similarity index 100%
rename from ctdb/tests/cunit/config_test_002.sh
rename to ctdb/tests/UNIT/cunit/config_test_002.sh

diff --git a/ctdb/tests/cunit/config_test_003.sh b/ctdb/tests/UNIT/cunit/config_test_003.sh
similarity index 100%
rename from ctdb/tests/cunit/config_test_003.sh
rename to ctdb/tests/UNIT/cunit/config_test_003.sh

diff --git a/ctdb/tests/cunit/config_test_004.sh b/ctdb/tests/UNIT/cunit/config_test_004.sh
similarity index 100%
rename from ctdb/tests/cunit/config_test_004.sh
rename to ctdb/tests/UNIT/cunit/config_test_004.sh

diff --git a/ctdb/tests/cunit/config_test_005.sh b/ctdb/tests/UNIT/cunit/config_test_005.sh
similarity index 100%
rename from ctdb/tests/cunit/config_test_005.sh
rename to ctdb/tests/UNIT/cunit/config_test_005.sh

diff --git a/ctdb/tests/cunit/config_test_006.sh b/ctdb/tests/UNIT/cunit/config_test_006.sh
similarity index 100%
rename from ctdb/tests/cunit/config_test_006.sh
rename to ctdb/tests/UNIT/cunit/config_test_006.sh

diff --git a/ctdb/tests/cunit/config_test_007.sh b/ctdb/tests/UNIT/cunit/config_test_007.sh
similarity index 100%
rename from ctdb/tests/cunit/config_test_007.sh
rename to ctdb/tests/UNIT/cunit/config_test_007.sh

diff --git a/ctdb/tests/cunit/ctdb_io_test_001.sh b/ctdb/tests/UNIT/cunit/ctdb_io_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/ctdb_io_test_001.sh
rename to ctdb/tests/UNIT/cunit/ctdb_io_test_001.sh

diff --git a/ctdb/tests/cunit/db_hash_test_001.sh b/ctdb/tests/UNIT/cunit/db_hash_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/db_hash_test_001.sh
rename to ctdb/tests/UNIT/cunit/db_hash_test_001.sh

diff --git a/ctdb/tests/cunit/event_protocol_test_001.sh b/ctdb/tests/UNIT/cunit/event_protocol_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/event_protocol_test_001.sh
rename to ctdb/tests/UNIT/cunit/event_protocol_test_001.sh

diff --git a/ctdb/tests/cunit/event_script_test_001.sh b/ctdb/tests/UNIT/cunit/event_script_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/event_script_test_001.sh
rename to ctdb/tests/UNIT/cunit/event_script_test_001.sh

diff --git a/ctdb/tests/cunit/hash_count_test_001.sh b/ctdb/tests/UNIT/cunit/hash_count_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/hash_count_test_001.sh
rename to ctdb/tests/UNIT/cunit/hash_count_test_001.sh

diff --git a/ctdb/tests/cunit/line_test_001.sh b/ctdb/tests/UNIT/cunit/line_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/line_test_001.sh
rename to ctdb/tests/UNIT/cunit/line_test_001.sh

diff --git a/ctdb/tests/cunit/path_tests_001.sh b/ctdb/tests/UNIT/cunit/path_tests_001.sh
similarity index 100%
rename from ctdb/tests/cunit/path_tests_001.sh
rename to ctdb/tests/UNIT/cunit/path_tests_001.sh

diff --git a/ctdb/tests/cunit/pidfile_test_001.sh b/ctdb/tests/UNIT/cunit/pidfile_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/pidfile_test_001.sh
rename to ctdb/tests/UNIT/cunit/pidfile_test_001.sh

diff --git a/ctdb/tests/cunit/pkt_read_001.sh b/ctdb/tests/UNIT/cunit/pkt_read_001.sh
similarity index 100%
rename from ctdb/tests/cunit/pkt_read_001.sh
rename to ctdb/tests/UNIT/cunit/pkt_read_001.sh

diff --git a/ctdb/tests/cunit/pkt_write_001.sh b/ctdb/tests/UNIT/cunit/pkt_write_001.sh
similarity index 100%
rename from ctdb/tests/cunit/pkt_write_001.sh
rename to ctdb/tests/UNIT/cunit/pkt_write_001.sh

diff --git a/ctdb/tests/cunit/porting_tests_001.sh b/ctdb/tests/UNIT/cunit/porting_tests_001.sh
similarity index 100%
rename from ctdb/tests/cunit/porting_tests_001.sh
rename to ctdb/tests/UNIT/cunit/porting_tests_001.sh

diff --git a/ctdb/tests/cunit/protocol_test_001.sh b/ctdb/tests/UNIT/cunit/protocol_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/protocol_test_001.sh
rename to ctdb/tests/UNIT/cunit/protocol_test_001.sh

diff --git a/ctdb/tests/cunit/protocol_test_002.sh b/ctdb/tests/UNIT/cunit/protocol_test_002.sh
similarity index 100%
rename from ctdb/tests/cunit/protocol_test_002.sh
rename to ctdb/tests/UNIT/cunit/protocol_test_002.sh

diff --git a/ctdb/tests/cunit/protocol_test_012.sh b/ctdb/tests/UNIT/cunit/protocol_test_012.sh
similarity index 100%
rename from ctdb/tests/cunit/protocol_test_012.sh
rename to ctdb/tests/UNIT/cunit/protocol_test_012.sh

diff --git a/ctdb/tests/cunit/protocol_test_101.sh b/ctdb/tests/UNIT/cunit/protocol_test_101.sh
similarity index 100%
rename from ctdb/tests/cunit/protocol_test_101.sh
rename to ctdb/tests/UNIT/cunit/protocol_test_101.sh

diff --git a/ctdb/tests/cunit/protocol_test_111.sh b/ctdb/tests/UNIT/cunit/protocol_test_111.sh
similarity index 100%
rename from ctdb/tests/cunit/protocol_test_111.sh
rename to ctdb/tests/UNIT/cunit/protocol_test_111.sh

diff --git a/ctdb/tests/cunit/protocol_test_201.sh b/ctdb/tests/UNIT/cunit/protocol_test_201.sh
similarity index 100%
rename from ctdb/tests/cunit/protocol_test_201.sh
rename to ctdb/tests/UNIT/cunit/protocol_test_201.sh

diff --git a/ctdb/tests/cunit/rb_test_001.sh b/ctdb/tests/UNIT/cunit/rb_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/rb_test_001.sh
rename to ctdb/tests/UNIT/cunit/rb_test_001.sh

diff --git a/ctdb/tests/cunit/reqid_test_001.sh b/ctdb/tests/UNIT/cunit/reqid_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/reqid_test_001.sh
rename to ctdb/tests/UNIT/cunit/reqid_test_001.sh

diff --git a/ctdb/tests/cunit/run_event_001.sh b/ctdb/tests/UNIT/cunit/run_event_001.sh
similarity index 100%
rename from ctdb/tests/cunit/run_event_001.sh
rename to ctdb/tests/UNIT/cunit/run_event_001.sh

diff --git a/ctdb/tests/cunit/run_proc_001.sh b/ctdb/tests/UNIT/cunit/run_proc_001.sh
similarity index 100%
rename from ctdb/tests/cunit/run_proc_001.sh
rename to ctdb/tests/UNIT/cunit/run_proc_001.sh

diff --git a/ctdb/tests/cunit/sock_daemon_test_001.sh b/ctdb/tests/UNIT/cunit/sock_daemon_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/sock_daemon_test_001.sh
rename to ctdb/tests/UNIT/cunit/sock_daemon_test_001.sh

diff --git a/ctdb/tests/cunit/sock_io_test_001.sh b/ctdb/tests/UNIT/cunit/sock_io_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/sock_io_test_001.sh
rename to ctdb/tests/UNIT/cunit/sock_io_test_001.sh

diff --git a/ctdb/tests/cunit/srvid_test_001.sh b/ctdb/tests/UNIT/cunit/srvid_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/srvid_test_001.sh
rename to ctdb/tests/UNIT/cunit/srvid_test_001.sh

diff --git a/ctdb/tests/cunit/system_socket_test_001.sh b/ctdb/tests/UNIT/cunit/system_socket_test_001.sh
similarity index 100%
rename from ctdb/tests/cunit/system_socket_test_001.sh
rename to ctdb/tests/UNIT/cunit/system_socket_test_001.sh

diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index 48a272664c0a1f54480b75e3f7fc4615c470f0fa..a787db7ba16a2be7e3d0a97d3ad5e027024ee7d8 100755 (executable)
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -303,7 +303,7 @@ summary_file="${test_state_dir}/.summary"
 export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts"
 
 unit_tests="
-       cunit
+       UNIT/cunit
        eventd
        eventscripts
        onnode

diff --git a/ctdb/wscript b/ctdb/wscript
index 5843f2ce5b82bfe63eec90d7d28c1208bf7c4199..2c9a718fc766b69b07cdfcb25210ce4cea8a5346 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -1048,8 +1048,8 @@ def build(bld):
                          install_path='${CTDB_TEST_LIBEXECDIR}')
 
     test_subdirs = [
+        'UNIT',
         'complex',
-        'cunit',
         'etc-ctdb',
         'eventd',
         'eventscripts',