From ba4115ece789c898163aee5d6bb00bcbc726b6bc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 15 Sep 2006 23:00:32 +0000
Subject: 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)
---
 source4/script/tests/selftest.sh       | 2 +-
 source4/script/tests/test_functions.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'source4')

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"
-- 
cgit