ctdb-tests: Move simple tests to INTEGRATION/ subdirectory

[vlendec/samba-autobuild/.git] / ctdb / tests / run_tests.sh

diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index 829c1de9e84318f6c5014e4d183b474268bbcd99..2d71069edcbde746be843bd959a27aadce9eb3f0 100755 (executable)
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -251,7 +251,7 @@ run_tests ()
                        */*/*)
                                die "test \"$f\" is not recognised"
                                ;;
-                       */*|simple)
+                       */*)
                                # This is a test suite
                                subtests=$(echo "${f%/}/"*".sh")
                                if [ "$subtests" = "${f%/}/*.sh" ] ; then
@@ -259,7 +259,7 @@ run_tests ()
                                        die "test \"$f\" is not recognised"
                                fi
                                ;;
-                       CLUSTER|UNIT)
+                       CLUSTER|INTEGRATION|UNIT)
                                # A collection of test suites
                                subtests=$(echo "${f%/}/"*)
                                ;;
@@ -307,9 +307,9 @@ export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts"
 # If no tests specified then run some defaults
 if [ -z "$1" ] ; then
        if [ -n "$TEST_LOCAL_DAEMONS" ] ; then
-               set -- UNIT simple
+               set -- UNIT INTEGRATION
        else
-               set -- simple CLUSTER
+               set -- INTEGRATION CLUSTER
     fi
 fi