[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Wed May 30 22:37:03 MDT 2012
The branch, master has been updated
via 15d5672 build: rename build targets smbclient -> smbclient4 and smbclient3 -> smbclient
via 7699085 s4:selftest: change the blackbox.samba_tool_demote test to use a binary mapping for smbclient
via 72fbbdb s4:selftest: change the blackbox.passwords test to use a binary mapping for smbclient
via e7281b4 s4:selftest: change the blackbox.pkinit test to use a binary mapping for smbclient
via d86ae30 s4:selftest: change the blackbox.kinit test to use a binary mapping for smbclient
via 104135fa s4:selftest: change the blackbox.export.keytab test to use a binary mapping for smbclient
via 00f5473 s4:selftest: change the blackbox.chgdcpass test to use a binary mapping for smbclient
via df0cadb s4:selftest: change the blackbox.samba_tool test to use a binary mapping for smbclient
via da82c07 s4:selftets: change the blackbox.bogusdomain test to use binary mapping for smbclient
via 11a2eea s4:selftest: change the blackbox.smbclient test to use binary mapping for smbclient
via 4b07193 s3:selftest: add a binary mapping for smbclient4
via 37194f5 selftest: add a binary mapping for smbclient4
via 52e1bba build: rename build targets nmblookup -> nmblookup4 and nmblookup3 -> nmblookup
via 0659a70 build: add a build suffix ("4") for s4-binaries
via fef5ce7 s4:selftest: determine nmblookup via binary mapping for blackbox test in tests.py
via f6e6086 selftest:Samba4: use the nmblookup4 binary mapping
via f56ada0 s3:selftest: add a binary mapping for nmblookup4
via ab39551 selftest: add a binary mapping for nmblookup4
via 13181f3 s3:selftest: improve strange linebreaks for blackbox tests in tests.py for readability
via 910a497 s3:selftest: introduce a variable for binpath('dbwrap_tool') in tests.py
via 953163d s3:selftest: introduce a variable for binpath('ntlm_auth3') in tests.py
via 5ec763a s3:selftest: introduce a variable for binpath('smbtorture3') in tests.py
via 886169b s3:selftest: introduce a variable for binpath('net') in tests.py
via f9aef09 s3:selftest: introduce a variable for binpath('wbinfo') in tests.py
via 4f611bc s3:selftest: introduce a variable for binpath('smbclient3') to test.py
via 24bdec9 s3:selftest: introduce a variable for binpath('nmblookup3') in tests.py
via 3d504b8 s3:build: fix some spacing in wscript_build
from 5d1a8d2 Stop spamming the logs with "Could not remove pid XX from serverid.tdb" messages and initiating the cleanup function on every process death.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 15d567265e65e3d47579232a649d6d54f7b32d35
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 13:10:57 2012 +0200
build: rename build targets smbclient -> smbclient4 and smbclient3 -> smbclient
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Thu May 31 06:36:55 CEST 2012 on sn-devel-104
commit 769908540f047f24fcd3c57a90843abca85252b2
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 12:21:42 2012 +0200
s4:selftest: change the blackbox.samba_tool_demote test to use a binary mapping for smbclient
commit 72fbbdb9b35fe2f6da09512fe9d887c7a8211739
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 12:18:35 2012 +0200
s4:selftest: change the blackbox.passwords test to use a binary mapping for smbclient
commit e7281b450a5d77b783f0d840d1097593b57f781f
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 12:16:49 2012 +0200
s4:selftest: change the blackbox.pkinit test to use a binary mapping for smbclient
commit d86ae30bb8cce9fb78b655a05f3eaba4fc6a0bb8
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 12:15:10 2012 +0200
s4:selftest: change the blackbox.kinit test to use a binary mapping for smbclient
commit 104135faa9d0c7926ceea2f3fc1152312414f210
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 12:09:25 2012 +0200
s4:selftest: change the blackbox.export.keytab test to use a binary mapping for smbclient
commit 00f5473de8e34fc7077ca48ca29d2fa5c8c1814e
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 12:07:18 2012 +0200
s4:selftest: change the blackbox.chgdcpass test to use a binary mapping for smbclient
commit df0cadbcc9c3706c8ef86dbc431795b31c1fce70
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 12:04:30 2012 +0200
s4:selftest: change the blackbox.samba_tool test to use a binary mapping for smbclient
commit da82c07e13d1d4ecd32c4b040477f12b2388941c
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 11:57:16 2012 +0200
s4:selftets: change the blackbox.bogusdomain test to use binary mapping for smbclient
commit 11a2eeabaaf17be5475dce0cfed3022b08937876
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 11:48:02 2012 +0200
s4:selftest: change the blackbox.smbclient test to use binary mapping for smbclient
commit 4b071937053430601edb00c9fae0dba3211d6741
Author: Michael Adam <obnox at samba.org>
Date: Fri May 25 01:40:58 2012 +0200
s3:selftest: add a binary mapping for smbclient4
commit 37194f5f25304f062cdb2eebafcc5b7c7dfc8ca2
Author: Michael Adam <obnox at samba.org>
Date: Fri May 25 01:40:32 2012 +0200
selftest: add a binary mapping for smbclient4
commit 52e1bba86164235ecaff7a6c9c5c2101fa06e863
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 13:09:57 2012 +0200
build: rename build targets nmblookup -> nmblookup4 and nmblookup3 -> nmblookup
commit 0659a708e7cd3d4692f6585b20fcfe8f93b524e1
Author: Michael Adam <obnox at samba.org>
Date: Wed May 30 13:01:18 2012 +0200
build: add a build suffix ("4") for s4-binaries
commit fef5ce7f0f53b2a33bd30ff8ebe639f622520d20
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 16:35:18 2012 +0200
s4:selftest: determine nmblookup via binary mapping for blackbox test in tests.py
commit f6e6086ad06e86a0bf6e6bc636b1cef477568aed
Author: Michael Adam <obnox at samba.org>
Date: Fri May 25 01:44:17 2012 +0200
selftest:Samba4: use the nmblookup4 binary mapping
commit f56ada09786cd4b335f1bbe57c7c9a60eefcc5aa
Author: Michael Adam <obnox at samba.org>
Date: Fri May 25 01:42:37 2012 +0200
s3:selftest: add a binary mapping for nmblookup4
commit ab39551f7ec0c12fa9423455b5571cac6eedf35c
Author: Michael Adam <obnox at samba.org>
Date: Fri May 25 01:42:20 2012 +0200
selftest: add a binary mapping for nmblookup4
commit 13181f33411db3abb53771f7a486f849842f8320
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 13:59:14 2012 +0200
s3:selftest: improve strange linebreaks for blackbox tests in tests.py for readability
commit 910a4977f102bff08359257fb6481a399921aee6
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 13:51:05 2012 +0200
s3:selftest: introduce a variable for binpath('dbwrap_tool') in tests.py
commit 953163ddc7f1cb6dcfcb2172382c4d372465744c
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 13:47:32 2012 +0200
s3:selftest: introduce a variable for binpath('ntlm_auth3') in tests.py
commit 5ec763aeec3743aeee8e6fdfe6a518bd12d05641
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 13:45:49 2012 +0200
s3:selftest: introduce a variable for binpath('smbtorture3') in tests.py
commit 886169b380dbc099d0ec97343840756e426b3a5d
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 13:44:03 2012 +0200
s3:selftest: introduce a variable for binpath('net') in tests.py
commit f9aef09454278ef7c0074d1e9aec1dbdcf33a235
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 12:18:19 2012 +0200
s3:selftest: introduce a variable for binpath('wbinfo') in tests.py
to remove explicit calls to binpath('wbinfo')
commit 4f611bcc1b17875052dbf2f4a932fbd6ce2b5b8e
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 12:16:12 2012 +0200
s3:selftest: introduce a variable for binpath('smbclient3') to test.py
to remove manual calls to binpath("smbclient3")
commit 24bdec94d7b808e184734303c26788f7618897d0
Author: Michael Adam <obnox at samba.org>
Date: Tue May 29 12:10:16 2012 +0200
s3:selftest: introduce a variable for binpath('nmblookup3') in tests.py
commit 3d504b8a63c51737ed162add75a93d3a725445f3
Author: Michael Adam <obnox at samba.org>
Date: Fri May 18 15:02:31 2012 +0200
s3:build: fix some spacing in wscript_build
-----------------------------------------------------------------------
Summary of changes:
libcli/nbt/wscript_build | 2 +-
selftest/target/Samba3.pm | 11 ++--
selftest/target/Samba4.pm | 2 +-
selftest/wscript | 6 +-
source3/selftest/s3-selftest.sh | 4 +-
source3/selftest/tests.py | 108 +++++++++++++++++-------------
source3/wscript_build | 16 ++--
source4/client/tests/test_smbclient.sh | 8 +--
source4/selftest/tests.py | 27 ++++---
source4/utils/tests/test_demote.sh | 4 +-
source4/utils/tests/test_nmblookup.sh | 6 +-
source4/utils/tests/test_samba_tool.sh | 4 +-
source4/wscript_build | 2 +-
testprogs/blackbox/bogus.sh | 4 +-
testprogs/blackbox/test_chgdcpass.sh | 6 +-
testprogs/blackbox/test_export_keytab.sh | 6 +-
testprogs/blackbox/test_kinit.sh | 6 +-
testprogs/blackbox/test_passwords.sh | 6 +-
testprogs/blackbox/test_pkinit.sh | 6 +-
wscript_build | 1 +
20 files changed, 127 insertions(+), 108 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index faf818e..f67ba91 100755
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('cli-nbt',
private_library=True
)
-bld.SAMBA_BINARY('nmblookup',
+bld.SAMBA_BINARY('nmblookup' + bld.env.suffix4,
source='tools/nmblookup.c',
manpages='man/nmblookup.1',
deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE'
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index d55c6d7..098f532 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1085,11 +1085,12 @@ sub wait_for_start($$)
print "delaying for nbt name registration\n";
sleep(10);
# This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init
- system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__");
- system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} __SAMBA__");
- system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__");
- system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}");
- system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} $envvars->{SERVER}");
+ my $nmblookup = Samba::bindir_path($self, "nmblookup3");
+ system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__");
+ system("$nmblookup $envvars->{CONFIGURATION} __SAMBA__");
+ system("$nmblookup $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__");
+ system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}");
+ system("$nmblookup $envvars->{CONFIGURATION} $envvars->{SERVER}");
# make sure smbd is also up set
print "wait for smbd\n";
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 4622f8e..97cdbf2 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -147,7 +147,7 @@ sub wait_for_start($$)
# This will return quickly when things are up, but be slow if we
# need to wait for (eg) SSL init
- my $nmblookup = Samba::bindir_path($self, "nmblookup");
+ my $nmblookup = Samba::bindir_path($self, "nmblookup4");
system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{SERVER}");
system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{SERVER}");
system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}");
diff --git a/selftest/wscript b/selftest/wscript
index 182f8f9..ea37a62 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -110,8 +110,10 @@ def cmd_testonly(opt):
if o[0:1] != '_':
os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
- binary_mapping = ('nmblookup3:nmblookup3,' +
- 'smbclient3:smbclient3,' +
+ binary_mapping = ('nmblookup3:nmblookup,' +
+ 'nmblookup4:nmblookup4,' +
+ 'smbclient3:smbclient,' +
+ 'smbclient4:smbclient4,' +
'smbtorture4:smbtorture,' +
'ntlm_auth3:ntlm_auth3')
diff --git a/source3/selftest/s3-selftest.sh b/source3/selftest/s3-selftest.sh
index f5f6f2a..335398a 100755
--- a/source3/selftest/s3-selftest.sh
+++ b/source3/selftest/s3-selftest.sh
@@ -24,7 +24,7 @@ st_test_done() {
if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then
( rm -f ${SELFTESTPREFIX}/st_done && \
${PERL} ${SELFTESTDIR}/selftest.pl \
- --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,smbclient3:smbclient,ntlm_auth3:ntlm_auth \
+ --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth \
--prefix=${SELFTESTPREFIX} --target=samba3 \
--testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \
--exclude=${SELFTESTDIR}/skip \
@@ -38,7 +38,7 @@ if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then
else
( rm -f ${SELFTESTPREFIX}/st_done && \
${PERL} ${SELFTESTDIR}/selftest.pl \
- --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,smbclient3:smbclient,ntlm_auth3:ntlm_auth \
+ --binary-mapping=smbtorture3:smbtorture,nmblookup3:nmblookup,nmblookup4:nmblookup4,smbclient3:smbclient,smbclient4:smbclient4,ntlm_auth3:ntlm_auth \
--prefix=${SELFTESTPREFIX} --target=samba3 \
--testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \
--exclude=${SELFTESTDIR}/skip \
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index d876ef5..c131ca2 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -27,6 +27,13 @@ samba3srcdir = srcdir() + "/source3"
configuration = "--configfile=$SMB_CONF_PATH"
scriptdir=os.path.join(samba3srcdir, "../script/tests")
+smbclient = binpath('smbclient3')
+wbinfo = binpath('wbinfo')
+net = binpath('net')
+smbtorture3 = binpath('smbtorture3')
+ntlm_auth = binpath('ntlm_auth3')
+dbwrap_tool = binpath('dbwrap_tool')
+
torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME",
"--basedir=$SELFTEST_TMPDIR",
'--option="torture:winbindd_netbios_name=$SERVER"',
@@ -69,7 +76,7 @@ plantestsuite("samba3.blackbox.failure", "s3dc:local", [os.path.join(samba3srcdi
plantestsuite("samba3.local_s3", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_local_s3.sh")])
-plantestsuite("samba3.blackbox.registry.upgrade", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_registry_upgrade.sh"), binpath('net'), binpath('dbwrap_tool')])
+plantestsuite("samba3.blackbox.registry.upgrade", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_registry_upgrade.sh"), net, dbwrap_tool])
tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7", "LOCK9",
"UNLINK", "BROWSE", "ATTR", "TRANS2", "TORTURE",
@@ -86,9 +93,9 @@ tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7",
"BAD-NBT-SESSION"]
for t in tests:
- plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
- plantestsuite("samba3.smbtorture_s3.crypt(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "-e", "-l $LOCAL_PATH"])
- plantestsuite("samba3.smbtorture_s3.plain(dc).%s" % t, "dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
+ plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
+ plantestsuite("samba3.smbtorture_s3.crypt(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"])
+ plantestsuite("samba3.smbtorture_s3.plain(dc).%s" % t, "dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
env = "s3dc:local"
t = "CLEANUP3"
@@ -115,7 +122,7 @@ local_tests=[
"LOCAL-remove_duplicate_addrs2"]
for t in local_tests:
- plantestsuite("samba3.smbtorture_s3.%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "-e"])
+ plantestsuite("samba3.smbtorture_s3.%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e"])
tests=["--ping", "--separator",
"--own-domain",
@@ -142,11 +149,11 @@ tests=["--ping", "--separator",
for options in ["--option=clientusespnego=no", " --option=clientntlmv2auth=no --option=clientlanmanauth=yes --max-protocol=LANMAN2", ""]:
env = "s3dc"
- plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) %s" % (env, options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration, options])
+ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) %s" % (env, options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient, configuration, options])
for env in ["s3dc", "member", "s3member"]:
- plantestsuite("samba3.blackbox.smbclient_auth.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration])
- plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration])
+ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient, configuration])
+ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', smbclient, configuration])
for t in tests:
plantestsuite("samba3.wbinfo_s3.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t])
@@ -157,65 +164,74 @@ for env in ["s3dc", "member", "s3member"]:
plantestsuite(
"samba3.ntlm_auth.diagnostics(%s:local)" % env, "%s:local" % env,
- [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_diagnostics.sh"), binpath('ntlm_auth3'), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
+ [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_diagnostics.sh"), ntlm_auth, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
- plantestsuite("samba3.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
+ plantestsuite("samba3.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, ntlm_auth, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
env = "s3member"
t = "--krb5auth=$DOMAIN\\\\$DC_USERNAME%$DC_PASSWORD"
plantestsuite("samba3.wbinfo_s3.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t])
-plantestsuite("samba3.ntlm_auth.krb5(ktest:local) old ccache", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$PREFIX/ktest/krb5_ccache-2', '$SERVER', configuration])
+plantestsuite("samba3.ntlm_auth.krb5(ktest:local) old ccache", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, ntlm_auth, '$PREFIX/ktest/krb5_ccache-2', '$SERVER', configuration])
-plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$PREFIX/ktest/krb5_ccache-3', '$SERVER', configuration])
+plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, ntlm_auth, '$PREFIX/ktest/krb5_ccache-3', '$SERVER', configuration])
for env in ["maptoguest", "secshare"]:
- plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) local creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"])
+ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) local creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', smbclient, configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"])
env = "maptoguest"
-plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) bad username" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', 'notmy$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"])
+plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) bad username" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', 'notmy$USERNAME', '$PASSWORD', smbclient, configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"])
# plain
for env in ["s3dc"]:
- plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration])
+ plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient, wbinfo, configuration])
for env in ["member", "s3member"]:
- plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration])
+ plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient, wbinfo, configuration])
for env in ["s3dc"]:
- plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration, "--signing=required"])
+ plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient, wbinfo, configuration, "--signing=required"])
for env in ["member", "s3member"]:
- plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration, "--signing=required"])
+ plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER\\\\$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient, wbinfo, configuration, "--signing=required"])
# encrypted
for env in ["s3dc"]:
- plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', binpath('smbclient3'), binpath('wbinfo'), configuration, "-e"])
+ plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient, wbinfo, configuration, "-e"])
#TODO encrypted against member, with member creds, and with DC creds
-plantestsuite("samba3.blackbox.net.misc", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"),
- scriptdir, "$SMB_CONF_PATH", binpath('net'), configuration])
-plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
- scriptdir, "$SMB_CONF_PATH", binpath('net'), configuration])
-plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry_check.sh"),
- scriptdir, "$SMB_CONF_PATH", binpath('net'), configuration,binpath('dbwrap_tool')])
-plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc", [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
- scriptdir, "$SMB_CONF_PATH", binpath('net'), configuration, 'rpc'])
-
-plantestsuite("samba3.blackbox.net.local.registry.roundtrip", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"),
- scriptdir, "$SMB_CONF_PATH", binpath('net'), configuration])
-plantestsuite("samba3.blackbox.net.rpc.registry.roundtrip", "s3dc", [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"),
- scriptdir, "$SMB_CONF_PATH", binpath('net'), configuration, 'rpc'])
-
-plantestsuite("samba3.blackbox.net.local.conf", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"),
- scriptdir, "$SMB_CONF_PATH", binpath('net'), configuration])
-plantestsuite("samba3.blackbox.net.rpc.conf", "s3dc", [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"),
- scriptdir, "$SMB_CONF_PATH", binpath('net'), configuration, 'rpc'])
-
-
-plantestsuite("samba3.blackbox.testparm", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_testparm_s3.sh"),
- "$LOCAL_PATH"])
+plantestsuite("samba3.blackbox.net.misc", "s3dc:local",
+ [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"),
+ scriptdir, "$SMB_CONF_PATH", net, configuration])
+plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local",
+ [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
+ scriptdir, "$SMB_CONF_PATH", net, configuration])
+plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local",
+ [os.path.join(samba3srcdir, "script/tests/test_net_registry_check.sh"),
+ scriptdir, "$SMB_CONF_PATH", net, configuration,dbwrap_tool])
+plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc",
+ [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
+ scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc'])
+
+plantestsuite("samba3.blackbox.net.local.registry.roundtrip", "s3dc:local",
+ [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"),
+ scriptdir, "$SMB_CONF_PATH", net, configuration])
+plantestsuite("samba3.blackbox.net.rpc.registry.roundtrip", "s3dc",
+ [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"),
+ scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc'])
+
+plantestsuite("samba3.blackbox.net.local.conf", "s3dc:local",
+ [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"),
+ scriptdir, "$SMB_CONF_PATH", net, configuration])
+plantestsuite("samba3.blackbox.net.rpc.conf", "s3dc",
+ [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"),
+ scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc'])
+
+
+plantestsuite("samba3.blackbox.testparm", "s3dc:local",
+ [os.path.join(samba3srcdir, "script/tests/test_testparm_s3.sh"),
+ "$LOCAL_PATH"])
plantestsuite(
"samba3.pthreadpool", "s3dc",
@@ -335,27 +351,27 @@ for options in options_list:
plantestsuite("samba3.blackbox.smbclient_krb5 old ccache %s" % options, "ktest:local",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_krb5.sh"),
"$PREFIX/ktest/krb5_ccache-2",
- binpath('smbclient3'), "$SERVER", options, configuration])
+ smbclient, "$SERVER", options, configuration])
plantestsuite("samba3.blackbox.smbclient_krb5 old ccache %s" % options, "ktest:local",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_krb5.sh"),
"$PREFIX/ktest/krb5_ccache-2",
- binpath('smbclient3'), "$SERVER", options, configuration])
+ smbclient, "$SERVER", options, configuration])
plantestsuite("samba3.blackbox.smbclient_large_file %s" % options, "ktest:local",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"),
"$PREFIX/ktest/krb5_ccache-3",
- binpath('smbclient3'), "$SERVER", "$PREFIX", options, "-k " + configuration])
+ smbclient, "$SERVER", "$PREFIX", options, "-k " + configuration])
plantestsuite("samba3.blackbox.smbclient_posix_large %s krb5" % options, "ktest:local",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"),
"$PREFIX/ktest/krb5_ccache-3",
- binpath('smbclient3'), "$SERVER", "$PREFIX", options, "-k " + configuration])
+ smbclient, "$SERVER", "$PREFIX", options, "-k " + configuration])
plantestsuite("samba3.blackbox.smbclient_posix_large %s NTLM" % options, "s3dc:local",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"),
"none",
- binpath('smbclient3'), "$SERVER", "$PREFIX", options, "-U$USERNAME%$PASSWORD " + configuration])
+ smbclient, "$SERVER", "$PREFIX", options, "-U$USERNAME%$PASSWORD " + configuration])
for e in endianness_options:
for a in auth_options:
diff --git a/source3/wscript_build b/source3/wscript_build
index f41401f..a4a6858 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -545,12 +545,12 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/
torture/test_authinfo_structs.c
torture/test_smbsock_any_connect.c
torture/test_cleanup.c
- torture/test_ctdbconn.c
- torture/test_msg.c
- torture/test_notify.c
- lib/tevent_barrier.c
- torture/test_dbwrap_watch.c
- torture/test_idmap_tdb_common.c
+ torture/test_ctdbconn.c
+ torture/test_msg.c
+ torture/test_notify.c
+ lib/tevent_barrier.c
+ torture/test_dbwrap_watch.c
+ torture/test_idmap_tdb_common.c
torture/t_strappend.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${LOCKING_SRC} ${FNAME_UTIL_SRC}
@@ -1217,7 +1217,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
''',
vars=locals())
-bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
+bld.SAMBA3_BINARY('client/smbclient',
source=CLIENT_SRC,
deps='''
talloc
@@ -1364,7 +1364,7 @@ bld.SAMBA3_BINARY('smbget',
smbclient''',
vars=locals())
-bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
+bld.SAMBA3_BINARY('nmblookup',
source=NMBLOOKUP_SRC,
deps='''
talloc
diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh
index 599eb70..d2f38e3 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 8279ba4..9a6af52 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -33,6 +33,9 @@ if validate:
else:
validate_list = []
+nmblookup = binpath('nmblookup4')
+smbclient = binpath('smbclient4')
+
def plansmbtorturetestsuite(name, env, options, modname=None):
if modname is None:
modname = "samba4.%s" % name
@@ -300,22 +303,22 @@ planpythontestsuite("dc", "samba.tests.dns")
planpythontestsuite("none", "samba.tests.blackbox.ndrdump")
planpythontestsuite("none", "samba.tests.source")
-plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN'])
-plantestsuite("samba4.blackbox.pkinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_pkinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration])
-plantestsuite("samba4.blackbox.kinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration])
-plantestsuite("samba4.blackbox.kinit(fl2000dc:local)", "fl2000dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", configuration])
-plantestsuite("samba4.blackbox.kinit(fl2008r2dc:local)", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration])
+plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient])
+plantestsuite("samba4.blackbox.pkinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_pkinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient, configuration])
+plantestsuite("samba4.blackbox.kinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient, configuration])
+plantestsuite("samba4.blackbox.kinit(fl2000dc:local)", "fl2000dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", smbclient, configuration])
+plantestsuite("samba4.blackbox.kinit(fl2008r2dc:local)", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient, configuration])
plantestsuite("samba4.blackbox.ktpass(dc)", "dc", [os.path.join(bbdir, "test_ktpass.sh"), '$PREFIX'])
-plantestsuite("samba4.blackbox.passwords(dc:local)", "dc:local", [os.path.join(bbdir, "test_passwords.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX"])
-plantestsuite("samba4.blackbox.export.keytab(dc:local)", "dc:local", [os.path.join(bbdir, "test_export_keytab.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX"])
+plantestsuite("samba4.blackbox.passwords(dc:local)", "dc:local", [os.path.join(bbdir, "test_passwords.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX", smbclient])
+plantestsuite("samba4.blackbox.export.keytab(dc:local)", "dc:local", [os.path.join(bbdir, "test_export_keytab.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX", smbclient])
plantestsuite("samba4.blackbox.cifsdd(dc)", "dc", [os.path.join(samba4srcdir, "client/tests/test_cifsdd.sh"), '$SERVER', '$USERNAME', '$PASSWORD', "$DOMAIN"])
-plantestsuite("samba4.blackbox.nmblookup(dc)", "dc", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP'])
+plantestsuite("samba4.blackbox.nmblookup(dc)", "dc", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP', nmblookup])
plantestsuite("samba4.blackbox.locktest(dc)", "dc", [os.path.join(samba4srcdir, "torture/tests/test_locktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
plantestsuite("samba4.blackbox.masktest", "dc", [os.path.join(samba4srcdir, "torture/tests/test_masktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
plantestsuite("samba4.blackbox.gentest(dc)", "dc", [os.path.join(samba4srcdir, "torture/tests/test_gentest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', "$PREFIX"])
plantestsuite("samba4.blackbox.wbinfo(dc:local)", "dc:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$USERNAME', '$PASSWORD', "dc"])
plantestsuite("samba4.blackbox.wbinfo(s4member:local)", "s4member:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', "s4member"])
-plantestsuite("samba4.blackbox.chgdcpass", "chgdcpass", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "CHGDCPASS\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/chgdcpass'])
+plantestsuite("samba4.blackbox.chgdcpass", "chgdcpass", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "CHGDCPASS\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/chgdcpass', smbclient])
plantestsuite_loadlist("samba4.rpc.echo against NetBIOS alias", "dc", [valgrindify(smb4torture), "$LISTOPT", 'ncacn_np:$NETBIOSALIAS', '-U$DOMAIN/$USERNAME%$PASSWORD', 'rpc.echo'])
# Tests using the "Simple" NTVFS backend
@@ -328,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")
@@ -358,7 +361,7 @@ for mech in [
plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc",
['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name)
-plantestsuite("samba4.blackbox.bogusdomain", "s3member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD'])
+plantestsuite("samba4.blackbox.bogusdomain", "s3member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient])
for mech in [
"-k no",
"-k no --option=usespnego=no",
@@ -518,7 +521,7 @@ plantestsuite("samba4.blackbox.provision-backend", "none", ["PYTHON=%s" % python
plantestsuite("samba4.blackbox.renamedc.sh", "none", ["PYTHON=%s" % python, os.path.join(bbdir, "renamedc.sh"), '$PREFIX/provision'])
# Demote the vampire DC, it must be the last test on the VAMPIRE DC
-plantestsuite("samba4.blackbox.samba_tool_demote(vampire_dc)", "vampire_dc", [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/vampire_dc'])
+plantestsuite("samba4.blackbox.samba_tool_demote(vampire_dc)", "vampire_dc", [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/vampire_dc', smbclient])
# check the databases are all OK. PLEASE LEAVE THIS AS THE LAST TEST
for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
plantestsuite("samba4.blackbox.dbcheck(%s)" % env, env + ":local" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck.sh"), '$PREFIX/provision', configuration])
diff --git a/source4/utils/tests/test_demote.sh b/source4/utils/tests/test_demote.sh
index 3d255ed..0c2c03c 100755
--- a/source4/utils/tests/test_demote.sh
+++ b/source4/utils/tests/test_demote.sh
@@ -8,12 +8,12 @@ PASSWORD=$4
DOMAIN=$5
DC=$6
PROV=$7
-shift 7
+smbclient=$8
+shift 8
failed=0
samba4bindir="$BINDIR"
-smbclient="$samba4bindir/smbclient"
samba_tool="$samba4bindir/samba-tool"
testit() {
diff --git a/source4/utils/tests/test_nmblookup.sh b/source4/utils/tests/test_nmblookup.sh
index c622db9..5e4fcfb 100755
--- a/source4/utils/tests/test_nmblookup.sh
+++ b/source4/utils/tests/test_nmblookup.sh
@@ -5,7 +5,8 @@ NETBIOSNAME=$1
NETBIOSALIAS=$2
SERVER=$3
SERVER_IP=$4
-shift 4
+nmblookup=$5
+shift 5
TORTURE_OPTIONS=$*
failed=0
@@ -26,9 +27,6 @@ testit() {
return $status
}
-samba4bindir="$BINDIR"
-nmblookup="$samba4bindir/nmblookup"
-
testit "nmblookup -U \$SERVER_IP \$SERVER" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $SERVER
testit "nmblookup -U \$SERVER_IP \$NETBIOSNAME" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $NETBIOSNAME
testit "nmblookup -U \$SERVER_IP \$NETBIOSALIAS" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $NETBIOSALIAS
diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh
index 7057312..289a753 100755
--- a/source4/utils/tests/test_samba_tool.sh
+++ b/source4/utils/tests/test_samba_tool.sh
@@ -6,12 +6,12 @@ SERVER_IP=$2
USERNAME=$3
PASSWORD=$4
DOMAIN=$5
-shift 5
+smbclient=$6
+shift 6
failed=0
samba4bindir="$BINDIR"
-smbclient="$samba4bindir/smbclient"
samba_tool="$samba4bindir/samba-tool"
testit() {
diff --git a/source4/wscript_build b/source4/wscript_build
index 47f251e..3996a12 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
--
Samba Shared Repository
More information about the samba-cvs
mailing list