diff options
author | Andrew Tridgell <tridge@samba.org> | 2006-09-15 22:39:30 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:48 -0500 |
commit | d6c128fb4c0d0f5368aa9729d1e4bb8005b909c6 (patch) | |
tree | 6f10dccd5e0ab5930cb7fb91dda39aed4727d113 /source4 | |
parent | 1ce5df6c724f8d943b9c32c23f9e8e551630ac4a (diff) | |
download | samba-d6c128fb4c0d0f5368aa9729d1e4bb8005b909c6.tar.gz samba-d6c128fb4c0d0f5368aa9729d1e4bb8005b909c6.tar.bz2 samba-d6c128fb4c0d0f5368aa9729d1e4bb8005b909c6.zip |
r18571: try to make it a lot more obvious when 'make test' or 'make quicktest'
has failed. The output was too subtle for people who aren't used to
it.
(This used to be commit a57decb96aee05d3238b64d50a136c8b8001f811)
Diffstat (limited to 'source4')
-rwxr-xr-x | source4/script/tests/selftest.sh | 8 | ||||
-rwxr-xr-x | source4/script/tests/test_functions.sh | 18 | ||||
-rwxr-xr-x | source4/script/tests/tests_all.sh | 30 | ||||
-rwxr-xr-x | source4/script/tests/tests_client.sh | 4 | ||||
-rwxr-xr-x | source4/script/tests/tests_quick.sh | 13 |
5 files changed, 40 insertions, 33 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 5b62af08a9..a8acb823a9 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -107,8 +107,10 @@ START=`date` bin/nmblookup $CONFIGURATION -U $SERVER $NETBIOSNAME # start off with 0 failures - failed=0 - export failed +failed=0 +export failed +totalfailed=0 +export totalfailed . script/tests/tests_$TESTS.sh exit $failed @@ -137,4 +139,4 @@ if [ "$count" != 0 ]; then done fi -teststatus $ARG0 $failed +teststatus $ARG0 $totalfailed diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh index e53bac1909..3d397ac255 100755 --- a/source4/script/tests/test_functions.sh +++ b/source4/script/tests/test_functions.sh @@ -100,7 +100,7 @@ testit() { date echo "Testing $name" else - echo "Testing $name ($failed)" + echo "Testing $name (`expr $failed + $totalfailed` test failed so far)" fi smbd_check_only && SMBD_IS_UP="yes" @@ -167,11 +167,14 @@ teststatus() { name=`basename $1` failed=$2 - if [ x"$failed" = x"0" ];then - echo "TEST STATUS: $failed"; - else - echo "TEST STATUS: $failed"; - fi + echo "TEST STATUS: $failed failures"; + test x"$failed" = x"0" || { +cat <<EOF +************************ +*** TESTSUITE FAILED *** +************************ +EOF + } exit $failed } @@ -180,3 +183,6 @@ if [ -z "$VALGRIND" ]; then export MALLOC_CHECK_ fi +# initialise the local failed variable to zero when starting each of the tests +failed=0 + diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh index b7227acc0c..aecaf8ac8e 100755 --- a/source4/script/tests/tests_all.sh +++ b/source4/script/tests/tests_all.sh @@ -1,16 +1,16 @@ #!/bin/sh - $SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_nbt.sh $SERVER || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN $NETBIOSNAME || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_binding_string.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_echo.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_local.sh || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_pidl.sh || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_smbclient.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_cifsdd.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD "" || failed=`expr $failed + $?` + $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_pidl.sh || totalfailed=`expr $totalfailed + $?` + $SRCDIR/script/tests/test_smbclient.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX || totalfailed=`expr $totalfailed + $?` + $SRCDIR/script/tests/test_cifsdd.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?` + $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?` diff --git a/source4/script/tests/tests_client.sh b/source4/script/tests/tests_client.sh index 6519d83a81..4c853d0f1c 100755 --- a/source4/script/tests/tests_client.sh +++ b/source4/script/tests/tests_client.sh @@ -1,3 +1,3 @@ #!/bin/sh - $SRCDIR/script/tests/test_smbclient.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX || failed=`expr $failed + $?` - $SRCDIR/script/tests/test_cifsdd.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?` + $SRCDIR/script/tests/test_smbclient.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX || totalfailed=`expr $totalfailed + $?` + $SRCDIR/script/tests/test_cifsdd.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?` diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh index 614b98008c..3c80910901 100755 --- a/source4/script/tests/tests_quick.sh +++ b/source4/script/tests/tests_quick.sh @@ -4,10 +4,9 @@ export TORTURE_OPTIONS TORTURE_QUICK="yes" export TORTURE_QUICK -$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD || failed=`expr $failed + $?` -$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?` -$SRCDIR/script/tests/test_nbt.sh $SERVER || failed=`expr $failed + $?` -$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" || failed=`expr $failed + $?` -$SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?` -$SRCDIR/script/tests/test_cifsposix.sh //$SERVER/cifsposixtestshare $USERNAME $PASSWORD "" || failed=`expr $failed + $?` - +$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_cifsposix.sh //$SERVER/cifsposixtestshare $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?` |