sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

ctdb-tests: Shutdown local daemons if the tests exit abnormally

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Pair-Programmed-With: Martin Schwenke <martin@meltin.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Amitay Isaacs 2014-07-04 17:04:10 +10:00 committed by Amitay Isaacs
parent c324b9f03f
commit e118a36c4c
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ctdb/tests/run_tests.sh
View File

@ -261,6 +261,29 @@ if [ -z "$1" ] ; then
fi
fi
do_cleanup ()
{
if $TEST_CLEANUP ; then
echo "Removing TEST_VAR_DIR=$TEST_VAR_DIR"
rm -rf "$TEST_VAR_DIR"
else
echo "Not cleaning up TEST_VAR_DIR=$TEST_VAR_DIR"
fi
}
cleanup_handler ()
{
if $TEST_CLEANUP ; then
if [ -n "$TEST_LOCAL_DAEMONS" -a "$f" = "simple" ] ; then
echo "***** shutting down daemons *****"
find_and_run_one_test simple/99_daemons_shutdown.sh "$tests_dir"
fi
fi
do_cleanup
}
trap cleanup_handler SIGINT SIGTERM
for f ; do
find_and_run_one_test "$f"
@ -295,12 +318,7 @@ rm -f "$sf"
echo
if $TEST_CLEANUP ; then
echo "Removing TEST_VAR_DIR=$TEST_VAR_DIR"
rm -rf "$TEST_VAR_DIR"
else
echo "Not cleaning up TEST_VAR_DIR=$TEST_VAR_DIR"
fi
do_cleanup
if $no_header || $exit_on_fail ; then
exit $status