summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-15 23:00:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:49 -0500
commitba4115ece789c898163aee5d6bb00bcbc726b6bc (patch)
tree7ee4c301ebcc31ecbbbcc93b64ff9ca4f4ba0c9a
parent818b01f177ae59b059098263b6782c84be438be5 (diff)
downloadsamba-ba4115ece789c898163aee5d6bb00bcbc726b6bc.tar.gz
samba-ba4115ece789c898163aee5d6bb00bcbc726b6bc.tar.bz2
samba-ba4115ece789c898163aee5d6bb00bcbc726b6bc.zip
r18575: - use the right variable to teststatus
- don't display the "(NN tests failed so far)" message unless a test has failed (This used to be commit da37e963cef065bb1c50543596e352c78e712ddc)
-rwxr-xr-xsource4/script/tests/selftest.sh2
-rwxr-xr-xsource4/script/tests/test_functions.sh7
2 files changed, 7 insertions, 2 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index a8acb823a9..021b713a02 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -139,4 +139,4 @@ if [ "$count" != 0 ]; then
done
fi
-teststatus $ARG0 $totalfailed
+teststatus $ARG0 $failed
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index 3d397ac255..29b03faf42 100755
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -100,7 +100,12 @@ testit() {
date
echo "Testing $name"
else
- echo "Testing $name (`expr $failed + $totalfailed` test failed so far)"
+ nf="`expr $failed + $totalfailed`";
+ if [ "$nf" = "0" ]; then
+ echo "Testing $name"
+ else
+ echo "Testing $name ($nf tests failed so far)"
+ fi
fi
smbd_check_only && SMBD_IS_UP="yes"