Author: jelmer Date: 2007-01-14 03:18:04 +0000 (Sun, 14 Jan 2007) New Revision: 20754
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20754 Log: Simplify code for calculating total number of failed tests. Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh branches/SAMBA_4_0/source/script/tests/tests_all.sh branches/SAMBA_4_0/source/script/tests/tests_quick.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/selftest.sh 2007-01-14 03:03:40 UTC (rev 20753) +++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2007-01-14 03:18:04 UTC (rev 20754) @@ -230,7 +230,7 @@ if [ "$LINE" = "-- TEST --" ]; then read NAME read CMDLINE - runtest "$NAME" "$CMDLINE" + runtest "$NAME" "$CMDLINE" || totalfailed=`expr $totalfailed + $?` else echo "$LINE" fi Modified: branches/SAMBA_4_0/source/script/tests/tests_all.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-01-14 03:03:40 UTC (rev 20753) +++ branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-01-14 03:18:04 UTC (rev 20754) @@ -1,15 +1,15 @@ #!/bin/sh - $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_nbt.sh $SERVER || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN $NETBIOSNAME || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_binding_string.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_echo.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_local.sh || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_pidl.sh || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?` + $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD + $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD + $SRCDIR/script/tests/test_nbt.sh $SERVER + $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" + $SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN + $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN + $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN $NETBIOSNAME + $SRCDIR/script/tests/test_binding_string.sh $SERVER $USERNAME $PASSWORD $DOMAIN + $SRCDIR/script/tests/test_echo.sh $SERVER $USERNAME $PASSWORD $DOMAIN + $SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD "" + $SRCDIR/script/tests/test_local.sh + $SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX + $SRCDIR/script/tests/test_pidl.sh + $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD "" Modified: branches/SAMBA_4_0/source/script/tests/tests_quick.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/tests_quick.sh 2007-01-14 03:03:40 UTC (rev 20753) +++ branches/SAMBA_4_0/source/script/tests/tests_quick.sh 2007-01-14 03:18:04 UTC (rev 20754) @@ -4,9 +4,9 @@ TORTURE_QUICK="yes" export TORTURE_QUICK -$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD || totalfailed=`expr $totalfailed + $?` -$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || totalfailed=`expr $totalfailed + $?` -$SRCDIR/script/tests/test_nbt.sh $SERVER || totalfailed=`expr $totalfailed + $?` -$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?` -$SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?` +$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD +$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD +$SRCDIR/script/tests/test_nbt.sh $SERVER +$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" +$SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN #$SRCDIR/script/tests/test_cifsposix.sh //$SERVER/cifsposixtestshare $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?`
