diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-04-16 14:54:51 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-04-16 14:57:45 +1000 |
| commit | 8e71c5ec902544e4c1941098cd2864a56a03dc94 (patch) | |
| tree | f65ef07d598fc2f0cd796113a2690aa8ba0000d8 | |
| parent | 9267727edb3c55665578a5a868127806ea39403e (diff) | |
| download | samba-8e71c5ec902544e4c1941098cd2864a56a03dc94.tar.gz samba-8e71c5ec902544e4c1941098cd2864a56a03dc94.tar.xz samba-8e71c5ec902544e4c1941098cd2864a56a03dc94.zip | |
tests - run_tests includes common.sh, uses die()
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 21df43c74bfcff420fdaf9df5440c25529c543d2)
| -rwxr-xr-x | ctdb/tests/scripts/run_tests | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/tests/scripts/run_tests b/ctdb/tests/scripts/run_tests index daa4b9c412..c2ff15a69b 100755 --- a/ctdb/tests/scripts/run_tests +++ b/ctdb/tests/scripts/run_tests @@ -5,7 +5,7 @@ # the arguments that it sees. . $(dirname $0)/ctdb_test_env : -. ctdb_test_functions.bash +. "${TEST_SCRIPTS_DIR}/common.sh" usage() { cat <<EOF @@ -123,7 +123,7 @@ run_one_test () { _f="$1" - [ -x "$_f" ] || fail "test \"$_f\" is not executable" + [ -x "$_f" ] || die "test \"$_f\" is not executable" tests_total=$(($tests_total + 1)) export TEST_SUBDIR=$(dirname "$_f") @@ -154,7 +154,7 @@ for f ; do elif [ -f "$f" ] ; then run_one_test "$f" else - fail "test \"$f\" is not recognised" + die "test \"$f\" is not recognised" fi done |