summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-05-30 11:48:02 +0200
committerMichael Adam <obnox@samba.org>2012-05-31 04:46:06 +0200
commit11a2eeabaaf17be5475dce0cfed3022b08937876 (patch)
tree0a1c09290ca64f1ff6b70ee6745d3805867fbb6d
parent4b071937053430601edb00c9fae0dba3211d6741 (diff)
downloadsamba-11a2eeabaaf17be5475dce0cfed3022b08937876.tar.gz
samba-11a2eeabaaf17be5475dce0cfed3022b08937876.tar.bz2
samba-11a2eeabaaf17be5475dce0cfed3022b08937876.zip
s4:selftest: change the blackbox.smbclient test to use binary mapping for smbclient
-rwxr-xr-xsource4/client/tests/test_smbclient.sh8
-rwxr-xr-xsource4/selftest/tests.py3
2 files changed, 5 insertions, 6 deletions
diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh
index 599eb70522..d2f38e3fcc 100755
--- a/source4/client/tests/test_smbclient.sh
+++ b/source4/client/tests/test_smbclient.sh
@@ -5,7 +5,7 @@
if [ $# -lt 5 ]; then
cat <<EOF
-Usage: test_smbclient.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
+Usage: test_smbclient.sh SERVER USERNAME PASSWORD DOMAIN PREFIX SMBCLIENT
EOF
exit 1;
fi
@@ -15,12 +15,10 @@ USERNAME=$2
PASSWORD=$3
DOMAIN=$4
PREFIX=$5
-shift 5
+smbclient=$6
+shift 6
failed=0
-samba4bindir="$BINDIR"
-smbclient="$samba4bindir/smbclient"
-
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
runcmd() {
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index f16557de39..eb92038b52 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -34,6 +34,7 @@ else:
validate_list = []
nmblookup = binpath('nmblookup4')
+smbclient = binpath('smbclient4')
def plansmbtorturetestsuite(name, env, options, modname=None):
if modname is None:
@@ -330,7 +331,7 @@ plansmbtorturetestsuite('rpc.echo', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$DO
plansmbtorturetestsuite('rpc.samr', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr against s4member server with local creds")
plansmbtorturetestsuite('rpc.samr.users', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr.users against s4member server with local creds",)
plansmbtorturetestsuite('rpc.samr.passwords', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr.passwords against s4member server with local creds")
-plantestsuite("samba4.blackbox.smbclient against s4member server with local creds", "s4member", [os.path.join(samba4srcdir, "client/tests/test_smbclient.sh"), '$NETBIOSNAME', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX'])
+plantestsuite("samba4.blackbox.smbclient against s4member server with local creds", "s4member", [os.path.join(samba4srcdir, "client/tests/test_smbclient.sh"), '$NETBIOSNAME', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX', smbclient])
# RPC Proxy
plansmbtorturetestsuite("rpc.echo", "rpc_proxy", ['ncacn_ip_tcp:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'], modname="samba4.rpc.echo against rpc proxy with domain creds")