testsuite: make diagnostic output more appropriate in tests_all.sh

[kai/samba.git] / source3 / script / tests / tests_all.sh

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 5e215379f7ba060d5664053bb02335dc04b46f7c..5a6b4678b1a628a6bec66a78317de427830dfb43 100755 (executable)
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,55 +1,55 @@
 local_s3() {
-       echo "RUNNING SUBTESTS local_s3"
+       echo "RUNNING TESTS local_s3"
        $SCRIPTDIR/test_local_s3.sh \
        || failed=`expr $failed + $?`
 }
 
 smbtorture_s3() {
-       echo "RUNNING SUBTESTS smbtorture_s3"
+       echo "RUNNING TESTS smbtorture_s3"
        $SCRIPTDIR/test_smbtorture_s3.sh \
                //$SERVER_IP/tmp $USERNAME $PASSWORD "" \
        || failed=`expr $failed + $?`
 }
 
 smbtorture_s3_encrypted() {
-       echo "RUNNING SUBTESTS smbtorture_s3_encrypted"
+       echo "RUNNING TESTS smbtorture_s3_encrypted"
        $SCRIPTDIR/test_smbtorture_s3.sh \
                //$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" \
        || failed=`expr $failed + $?`
 }
 
 smbclient_s3() {
-       echo "RUNNING SUBTESTS smbclient_s3"
+       echo "RUNNING TESTS smbclient_s3"
        $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP \
        || failed=`expr $failed + $?`
 }
 
 smbclient_s3_encrypted() {
-       echo "RUNNING SUBTESTS smbclient_s3_encrypted"
+       echo "RUNNING TESTS smbclient_s3_encrypted"
        $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" \
        || failed=`expr $failed + $?`
 }
 
 wbinfo_s3() {
-       echo "RUNNING SUBTESTS wbinfo_s3"
+       echo "RUNNING TESTS wbinfo_s3"
        $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD \
        || failed=`expr $failed + $?`
 }
 
 ntlm_auth_s3() {
-       echo "RUNNING SUBTESTS ntlm_auth_s3"
+       echo "RUNNING TESTS ntlm_auth_s3"
        $SCRIPTDIR/test_ntlm_auth_s3.sh \
        || failed=`expr $failed + $?`
 }
 
-net_registry() {
-       echo "RUNNING SUBTESTS net_registry"
-       $SCRIPTDIR/test_net_registry.sh \
+net_s3() {
+       echo "RUNNING TESTS net_s3"
+       $SCRIPTDIR/test_net_s3.sh \
        || failed=`expr $failed + $?`
 }
 
 posix_s3() {
-       echo "RUNNING SUBTESTS posix_s3"
+       echo "RUNNING TESTS posix_s3"
        eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
        eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
        SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
@@ -64,7 +64,7 @@ posix_s3() {
        fi
 }
 
-if test "x$RUNTESTS" = "x" ; then
+if test "x$TESTS" = "x" ; then
        local_s3
        smbtorture_s3
        smbtorture_s3_encrypted
@@ -72,10 +72,10 @@ if test "x$RUNTESTS" = "x" ; then
        smbclient_s3_encrypted
        wbinfo_s3
        ntlm_auth_s3
-       net_registry
+       net_s3
        posix_s3
 else
-       for THIS_TEST in $RUNTESTS; do
+       for THIS_TEST in $TESTS; do
                $THIS_TEST
        done
 fi