summaryrefslogtreecommitdiff
path: root/selftest/selftesthelpers.py
diff options
context:
space:
mode:
authorAdrian Cochrane <adrianc@catalyst.net.nz>2015-06-05 15:18:19 +1200
committerMichael Adam <obnox@samba.org>2015-06-08 13:03:14 +0200
commit47ad5d27eb2ec3ec660a91658afd599df8570562 (patch)
treeaa79b985f88cfce3d34f9c735ae13ab4087baa93 /selftest/selftesthelpers.py
parent873d3ccd483166c4e6e51d2fc86d900373bd8871 (diff)
downloadsamba-47ad5d27eb2ec3ec660a91658afd599df8570562.tar.gz
selftest: Apply rename filepath arguments so binary mapping doesn't have to.
Signed-off-by: Adrian Cochrane <adrianc@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'selftest/selftesthelpers.py')
-rw-r--r--selftest/selftesthelpers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index fc2937c4bdd..8cd2a937293 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -161,7 +161,7 @@ samba3srcdir = source3dir()
bbdir = os.path.join(srcdir(), "testprogs/blackbox")
configuration = "--configfile=$SMB_CONF_PATH"
-smbtorture4 = binpath("smbtorture4")
+smbtorture4 = binpath("smbtorture")
smbtorture4_testsuite_list = subprocess.Popen([smbtorture4, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines()
smbtorture4_options = [
@@ -187,9 +187,9 @@ def smbtorture4_testsuites(prefix):
return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
-smbclient3 = binpath('smbclient3')
+smbclient3 = binpath('smbclient')
smbtorture3 = binpath('smbtorture3')
-ntlm_auth3 = binpath('ntlm_auth3')
+ntlm_auth3 = binpath('ntlm_auth')
net = binpath('net')
scriptdir = os.path.join(srcdir(), "script/tests")