summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-26 08:27:37 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-26 02:28:26 +0200
commitd913a94eebddd815db7babc80fa5048137df65f7 (patch)
tree15875f764735a8b99b6c7d5f7bad28de48f674de
parenta7ffbf467d0f74ca171ba79e1c6e3506ae862302 (diff)
downloadsamba-d913a94eebddd815db7babc80fa5048137df65f7.tar.gz
samba-d913a94eebddd815db7babc80fa5048137df65f7.tar.bz2
samba-d913a94eebddd815db7babc80fa5048137df65f7.zip
selftest: push --target selection into plansmbtorturetestsuite
-rwxr-xr-xsource3/selftest/tests.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 70c8fe0e62..1a11081962 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -28,7 +28,7 @@ configuration = "--configfile=$SMB_CONF_PATH"
scriptdir=os.path.join(samba3srcdir, "../script/tests")
torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME",
- "--target=samba3", "--basedir=$SELFTEST_TMPDIR",
+ "--basedir=$SELFTEST_TMPDIR",
'--option="torture:winbindd_netbios_name=$SERVER"',
'--option="torture:winbindd_netbios_domain=$DOMAIN"',
'--option=torture:sharedelay=100000',
@@ -53,8 +53,9 @@ def smb4torture_testsuites(prefix):
return filter(lambda x: x.startswith(prefix), smb4torture_testsuite_list)
def plansmbtorturetestsuite(name, env, options, description=''):
- modname = "samba3.%s %s" % (name, description)
- cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name)
+ target = "samba3"
+ modname = "%s.%s %s" % (target, name, description)
+ cmdline = "%s $LISTOPT %s --target=%s %s" % (valgrindify(smb4torture), options, target, name)
if smb4torture_possible:
plantestsuite_loadlist(modname, env, cmdline)