s3:test: rename samba3.blackbox.net_s3_misc --> samba3.blackbox.net.misc

[nivanova/samba-autobuild/.git] / source3 / selftest / tests.sh

diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index e53981c89ede7cbf085a4a44c2225c31dbc67241..fbd0d9cd7a1d15c8ef57ec48a342c155f24019c1 100755 (executable)
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -40,20 +40,13 @@ plantest() {
        echo $cmdline "2>&1" "| ../selftest/filter-subunit --prefix \"$fullname.\""
 }
 
-normalize_testname() {
-       name=$1
-       shift 1
-       n=`echo $name | tr "A-Z-" "a-z."`
-       echo "$n $@"
-}
-
 TEST_FUNCTIONS_SH="INCLUDED"
 testit() {
        name=$1
        shift 1
        cmdline="$*"
 
-       plantest "`normalize_testname $testitprefix$name`" $testitenv $cmdline
+       plantest "$testitprefix$name" $testitenv $cmdline
        return
 }
 
@@ -86,6 +79,9 @@ export PASSWORD
 LOCAL_PATH="\$LOCAL_PATH"
 export LOCAL_PATH
 
+plantest "blackbox.success" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_success.sh
+plantest "blackbox.failure" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_failure.sh
+
 (
        shift $#
        testitprefix="local_s3."
@@ -156,7 +152,10 @@ 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.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.net_s3_registry_roundtrip" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_registry_roundtrip.sh
 plantest "blackbox.testparm_s3" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_testparm_s3.sh
 
 (