]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-tests: Drop custom handling for unit tests
authorMartin Schwenke <martin@meltin.net>
Mon, 9 Sep 2019 04:59:38 +0000 (14:59 +1000)
committerAmitay Isaacs <amitay@samba.org>
Thu, 26 Sep 2019 04:45:37 +0000 (04:45 +0000)
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tests/run_tests.sh

index b66e1b8bfbd22e7b0ff8211e04e07eaff912cfe5..f1795fa9e7be1967bd321c7e173bf9baab5182b6 100755 (executable)
@@ -306,17 +306,6 @@ summary_file="${test_state_dir}/.summary"
 
 export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts"
 
-unit_tests="
-       UNIT/cunit
-       UNIT/eventd
-       UNIT/eventscripts
-       UNIT/onnode
-       UNIT/shellcheck
-       UNIT/takeover
-       UNIT/takeover_helper
-       UNIT/tool
-"
-
 # If no tests specified then run some defaults
 if [ -z "$1" ] ; then
        if [ -n "$TEST_LOCAL_DAEMONS" ] ; then
@@ -339,18 +328,6 @@ do_cleanup ()
 trap "do_cleanup ; exit 130" SIGINT
 trap "do_cleanup ; exit 143" SIGTERM
 
-declare -a tests
-i=0
-for f ; do
-       if [ "$f" = "UNIT" ] ; then
-               for t in $unit_tests ; do
-                       tests[i++]="$t"
-               done
-       else
-               tests[i++]="$f"
-       fi
-done
-
 iterations=0
 # Special case: -I 0 means iterate forever (until failure)
 while [ "$max_iterations" -eq 0 ] || [ $iterations -lt "$max_iterations" ] ; do
@@ -364,7 +341,7 @@ while [ "$max_iterations" -eq 0 ] || [ $iterations -lt "$max_iterations" ] ; do
                echo
        fi
 
-       run_tests "${tests[@]}"
+       run_tests "$@"
        status=$?
 
        if [ $status -ne 0 ] ; then