s3-selftest: run the three net tests individually.

Guenther

diff --git a/source3/script/tests/test_net_s3.sh b/source3/script/tests/test_net_s3.sh
deleted file mode 100755 (executable)
index a0e83a6..0000000
--- a/source3/script/tests/test_net_s3.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# tests for the "net" command
-
-test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && {
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-}
-
-failed=0
-
-net_misc() {
-       echo "RUNNING SUBTESTS net_misc"
-       $SCRIPTDIR/test_net_misc.sh \
-       || failed=`expr $failed + $?`
-}
-
-net_registry() {
-       echo "RUNNING SUBTESTS net_registry"
-       $SCRIPTDIR/test_net_registry.sh \
-       || failed=`expr $failed + $?`
-}
-
-net_rpc_registry() {
-       echo "RUNNING SUBTESTS net_rpc_registry"
-       $SCRIPTDIR/test_net_registry.sh rpc \
-       || failed=`expr $failed + $?`
-}
-
-net_misc
-net_registry
-net_rpc_registry
-
-testok $0 $failed
-

diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 9457207df9b081775239b6d82ede01a23caeacb9..abac44257a93a4b5ea908beeed881cf6eceebc9f 100755 (executable)
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -149,7 +149,9 @@ plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smb
 #plantest "blackbox.smbclient_s3.crypt member creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$SERVER\\\\\$USERNAME \$PASSWORD "-e"
 #plantest "blackbox.smbclient_s3.crypt domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\\\\\$DC_USERNAME \$DC_PASSWORD "-e"
 
-plantest "blackbox.net_s3" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_s3.sh
+plantest "blackbox.net_s3_misc" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_misc.sh
+plantest "blackbox.net_s3_registry" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry.sh
+plantest "blackbox.net_s3_registry_rpc" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry.sh rpc
 plantest "blackbox.testparm_s3" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_testparm_s3.sh
 
 (