From 010c1a85fa9719b726d26c48aa3373f2e328e8f0 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 9 Sep 2019 10:48:05 +1000 Subject: [PATCH] ctdb-tests: Move shellcheck tests to UNIT/ subdirectory Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/{ => UNIT}/shellcheck/base_scripts.sh | 0 ctdb/tests/{ => UNIT}/shellcheck/ctdb_helpers.sh | 0 ctdb/tests/{ => UNIT}/shellcheck/ctdbd_wrapper.sh | 0 ctdb/tests/{ => UNIT}/shellcheck/event_scripts.sh | 0 ctdb/tests/{ => UNIT}/shellcheck/functions.sh | 0 ctdb/tests/{ => UNIT}/shellcheck/init_script.sh | 0 ctdb/tests/{ => UNIT}/shellcheck/scripts/local.sh | 0 ctdb/tests/{ => UNIT}/shellcheck/tests.sh | 0 ctdb/tests/{ => UNIT}/shellcheck/tools.sh | 0 ctdb/tests/run_tests.sh | 2 +- ctdb/wscript | 1 - 11 files changed, 1 insertion(+), 2 deletions(-) rename ctdb/tests/{ => UNIT}/shellcheck/base_scripts.sh (100%) rename ctdb/tests/{ => UNIT}/shellcheck/ctdb_helpers.sh (100%) rename ctdb/tests/{ => UNIT}/shellcheck/ctdbd_wrapper.sh (100%) rename ctdb/tests/{ => UNIT}/shellcheck/event_scripts.sh (100%) rename ctdb/tests/{ => UNIT}/shellcheck/functions.sh (100%) rename ctdb/tests/{ => UNIT}/shellcheck/init_script.sh (100%) rename ctdb/tests/{ => UNIT}/shellcheck/scripts/local.sh (100%) rename ctdb/tests/{ => UNIT}/shellcheck/tests.sh (100%) rename ctdb/tests/{ => UNIT}/shellcheck/tools.sh (100%) 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 52794f907ef..0a3cefb0f86 100755 --- 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 44edaaf13bc..9d7102d16a2 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -1051,7 +1051,6 @@ def build(bld): 'UNIT', 'complex', 'etc-ctdb', - 'shellcheck', 'simple', 'takeover', 'takeover_helper', -- 2.47.3