diff options
| author | Günther Deschner <gd@samba.org> | 2011-02-10 22:43:38 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-10 23:39:14 +0100 |
| commit | 961f6295a9cdbaf63c83e49386c2732737c2d4df (patch) | |
| tree | 799c7d586c45cee46cd46ce8066b9af483110a04 | |
| parent | 80d87e68dee28cde8f897dc9cbd5207b62491f8e (diff) | |
| download | samba-961f6295a9cdbaf63c83e49386c2732737c2d4df.tar.gz samba-961f6295a9cdbaf63c83e49386c2732737c2d4df.tar.bz2 samba-961f6295a9cdbaf63c83e49386c2732737c2d4df.zip | |
s3-selftest: run the three net tests individually.
Guenther
| -rwxr-xr-x | source3/script/tests/test_net_s3.sh | 35 | ||||
| -rwxr-xr-x | source3/selftest/tests.sh | 4 |
2 files changed, 3 insertions, 36 deletions
diff --git a/source3/script/tests/test_net_s3.sh b/source3/script/tests/test_net_s3.sh deleted file mode 100755 index a0e83a65b1..0000000000 --- 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 9457207df9..abac44257a 100755 --- 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 ( |