From 48bb69ef001be8270ddf145fa4884a2c5ddc2645 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 15 Apr 2011 15:17:58 +1000 Subject: selftest: Start using the binary mapping at the python layer as well --- source4/selftest/tests.py | 2 +- source4/selftest/wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index c4707b0886..dfbbc5752f 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 50acef8769..2bc2d4005b 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: -- cgit