ctdb-tests: Move shellcheck tests to UNIT/ subdirectory

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

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

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

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

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

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

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

diff --git a/ctdb/tests/shellcheck/scripts/local.sh b/ctdb/tests/UNIT/shellcheck/scripts/local.sh
similarity index 100%
rename from ctdb/tests/shellcheck/scripts/local.sh
rename to ctdb/tests/UNIT/shellcheck/scripts/local.sh

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

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

diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index 52794f907efee81249f79b6559acc4881a8cc22e..0a3cefb0f867412737bd3d145846276d446f042d 100755 (executable)
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -307,7 +307,7 @@ unit_tests="
        UNIT/eventd
        UNIT/eventscripts
        UNIT/onnode
-       shellcheck
+       UNIT/shellcheck
        takeover
        takeover_helper
        tool

diff --git a/ctdb/wscript b/ctdb/wscript
index 44edaaf13bce81d16817ea39602e4a49ff2f9698..9d7102d16a2ed50968d6b6d44cee0a33f555070f 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -1051,7 +1051,6 @@ def build(bld):
         'UNIT',
         'complex',
         'etc-ctdb',
-        'shellcheck',
         'simple',
         'takeover',
         'takeover_helper',