svn commit: samba r18575 - in branches/SAMBA_4_0/source/script/tests: .

tridge at samba.org tridge at samba.org
Fri Sep 15 23:00:34 GMT 2006


Author: tridge
Date: 2006-09-15 23:00:32 +0000 (Fri, 15 Sep 2006)
New Revision: 18575

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18575

Log:

- use the right variable to teststatus

- don't display the "(NN tests failed so far)" message unless a test
  has failed

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh
   branches/SAMBA_4_0/source/script/tests/test_functions.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.sh	2006-09-15 22:59:18 UTC (rev 18574)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh	2006-09-15 23:00:32 UTC (rev 18575)
@@ -139,4 +139,4 @@
     done
 fi
 
-teststatus $ARG0 $totalfailed
+teststatus $ARG0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_functions.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_functions.sh	2006-09-15 22:59:18 UTC (rev 18574)
+++ branches/SAMBA_4_0/source/script/tests/test_functions.sh	2006-09-15 23:00:32 UTC (rev 18575)
@@ -100,7 +100,12 @@
 		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"



More information about the samba-cvs mailing list