diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-01-14 03:18:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:40:44 -0500 |
| commit | 5ae1175460b6ac419fc30f0858e115321e689b33 (patch) | |
| tree | 11b35ee5882bb8c597ad93422613e4c3eb8e244c | |
| parent | d657ae5b199180ba75f1226d49f2f9e3362dec4e (diff) | |
| download | samba-5ae1175460b6ac419fc30f0858e115321e689b33.tar.gz samba-5ae1175460b6ac419fc30f0858e115321e689b33.tar.bz2 samba-5ae1175460b6ac419fc30f0858e115321e689b33.zip | |
r20754: Simplify code for calculating total number of failed tests.
(This used to be commit f288ca5f6805d04a2da60a26006ca293d9fa7cc0)
| -rwxr-xr-x | source4/script/tests/selftest.sh | 2 | ||||
| -rwxr-xr-x | source4/script/tests/tests_all.sh | 28 | ||||
| -rwxr-xr-x | source4/script/tests/tests_quick.sh | 10 |
3 files changed, 20 insertions, 20 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 96ae855f27..dd0ff195a8 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -230,7 +230,7 @@ export totalfailed if [ "$LINE" = "-- TEST --" ]; then read NAME read CMDLINE - runtest "$NAME" "$CMDLINE" + runtest "$NAME" "$CMDLINE" || totalfailed=`expr $totalfailed + $?` else echo "$LINE" fi diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh index 37d37ebd77..8f3f5522a0 100755 --- a/source4/script/tests/tests_all.sh +++ b/source4/script/tests/tests_all.sh @@ -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 "" diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh index 10fc489280..03f62522cf 100755 --- a/source4/script/tests/tests_quick.sh +++ b/source4/script/tests/tests_quick.sh @@ -4,9 +4,9 @@ export TORTURE_OPTIONS 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 + $?` |