s3:test: add the failure blackbox test as samba3.blackbox.failure

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

diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 7a9e68a243de6b455c3d7c9130627736a767199e..42085f8838e356bd2b8e25e8adcec5383d4ee55d 100755 (executable)
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+###   ^^^FIXME -> sh ... breaks testing on *BSD etc. ... see FIXME's below
 # This script generates a list of testsuites that should be run as part of 
 # the Samba 3 test suite.
 
@@ -30,19 +31,13 @@ plantest() {
        cmdline="$*"
        echo "-- TEST --"
        if [ "$env" = "none" ]; then
-               echo "samba3.$name"
+               fullname="samba3.$name"
        else
-               echo "samba3.$name ($env)"
+               fullname="samba3.$name ($env)"
        fi
+       echo $fullname
        echo $env
-       echo $cmdline
-}
-
-normalize_testname() {
-       name=$1
-       shift 1
-       n=`echo $name | tr "A-Z-" "a-z."`
-       echo "$n $@"
+       echo $cmdline "2>&1" "| ../selftest/filter-subunit --prefix \"$fullname.\""
 }
 
 TEST_FUNCTIONS_SH="INCLUDED"
@@ -51,7 +46,7 @@ testit() {
        shift 1
        cmdline="$*"
 
-       plantest "`normalize_testname $testitprefix$name`" $testitenv $cmdline
+       plantest "$testitprefix$name" $testitenv $cmdline
        return
 }
 
@@ -84,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."
@@ -95,6 +93,7 @@ export LOCAL_PATH
        shift $#
        testitprefix="smbtorture_s3.plain."
        testitenv="dc"
+#FIXME: shell sourcing with ARGS is just supported by bash but bash isn't everywhere.
        . $SCRIPTDIR/test_smbtorture_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" "" "-l \$LOCAL_PATH"
 )
 
@@ -102,6 +101,7 @@ export LOCAL_PATH
        shift $#
        testitprefix="smbtorture_s3.crypt."
        testitenv="dc"
+#FIXME: shell sourcing with ARGS is just supported by bash but bash isn't everywhere.
        . $SCRIPTDIR/test_smbtorture_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" "-e" "-l \$LOCAL_PATH"
 )
 
@@ -109,6 +109,7 @@ export LOCAL_PATH
        shift $#
        testitprefix="wbinfo_s3."
        testitenv="dc:local"
+#FIXME: shell sourcing with ARGS is just supported by bash but bash isn't everywhere.
        . $SCRIPTDIR/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$USERNAME \$PASSWORD
 )
 
@@ -116,6 +117,7 @@ export LOCAL_PATH
        shift $#
        testitprefix="wbinfo_s3."
        testitenv="dc:local"
+#FIXME: shell sourcing with ARGS is just supported by bash but bash isn't everywhere.
        . $SCRIPTDIR/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$DOMAIN\\\\\$USERNAME \$PASSWORD
 )
 
@@ -123,6 +125,7 @@ export LOCAL_PATH
        shift $#
        testitprefix="wbinfo_s3."
        testitenv="member:local"
+#FIXME: shell sourcing with ARGS is just supported by bash but bash isn't everywhere.
        . $SCRIPTDIR/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$DOMAIN\\\\\$USERNAME \$PASSWORD
 )
 
@@ -149,7 +152,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
 
 (
@@ -185,6 +190,7 @@ plantest "blackbox.testparm_s3" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDI
        if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
                echo "Using SMBTORTURE4: $SMBTORTURE4BINARY"
                echo "Version: $SMBTORTURE4VERSION"
+#FIXME: shell sourcing with ARGS is just supported by bash but bash isn't everywhere.
                . $SCRIPTDIR/test_posix_s3.sh //\$SERVER_IP/tmp \$USERNAME \$PASSWORD "" ""
        else
                echo "Skip Tests with Samba4's smbtorture"