summaryrefslogtreecommitdiffstats
path: root/source4/selftest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-15 15:17:58 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-16 11:43:04 +0200
commit48bb69ef001be8270ddf145fa4884a2c5ddc2645 (patch)
tree870d5ba1a5ae10c4feb82a2b9810551fdf721285 /source4/selftest
parent4fd6ebf544f90a6d18e6828eb3edc7b75f3b90a2 (diff)
downloadsamba-48bb69ef001be8270ddf145fa4884a2c5ddc2645.tar.gz
samba-48bb69ef001be8270ddf145fa4884a2c5ddc2645.tar.xz
samba-48bb69ef001be8270ddf145fa4884a2c5ddc2645.zip
selftest: Start using the binary mapping at the python layer as well
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/tests.py2
-rw-r--r--source4/selftest/wscript2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index c4707b08868..dfbbc5752fa 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -25,7 +25,7 @@ import subprocess
samba4srcdir = source4dir()
samba4bindir = bindir()
-smb4torture = binpath("smbtorture")
+smb4torture = binpath("smbtorture4")
smb4torture_testsuite_list = subprocess.Popen([smb4torture, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines()
validate = os.getenv("VALIDATE", "")
if validate:
diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 50acef8769e..2bc2d4005b8 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -103,7 +103,7 @@ def cmd_testonly(opt):
if o[0:1] != '_':
os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
- env.OPTIONS = ''
+ env.OPTIONS = '--binary-mapping=smbtorture4:smbtorture'
if not Options.options.SLOWTEST:
env.OPTIONS += ' --exclude=${srcdir}/source4/selftest/slow'
if Options.options.QUICKTEST: