summaryrefslogtreecommitdiff
path: root/source4/script/tests/test_functions.sh
diff options
context:
space:
mode:
Diffstat (limited to 'source4/script/tests/test_functions.sh')
-rwxr-xr-xsource4/script/tests/test_functions.sh18
1 files changed, 12 insertions, 6 deletions
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index e53bac1909..3d397ac255 100755
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -100,7 +100,7 @@ testit() {
date
echo "Testing $name"
else
- echo "Testing $name ($failed)"
+ echo "Testing $name (`expr $failed + $totalfailed` test failed so far)"
fi
smbd_check_only && SMBD_IS_UP="yes"
@@ -167,11 +167,14 @@ teststatus() {
name=`basename $1`
failed=$2
- if [ x"$failed" = x"0" ];then
- echo "TEST STATUS: $failed";
- else
- echo "TEST STATUS: $failed";
- fi
+ echo "TEST STATUS: $failed failures";
+ test x"$failed" = x"0" || {
+cat <<EOF
+************************
+*** TESTSUITE FAILED ***
+************************
+EOF
+ }
exit $failed
}
@@ -180,3 +183,6 @@ if [ -z "$VALGRIND" ]; then
export MALLOC_CHECK_
fi
+# initialise the local failed variable to zero when starting each of the tests
+failed=0
+