selftest: push --target selection into plansmbtorturetestsuite
authorAndrew Bartlett <abartlet@samba.org>
Wed, 25 Apr 2012 22:27:37 +0000 (08:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 26 Apr 2012 00:28:26 +0000 (02:28 +0200)
source3/selftest/tests.py

index 70c8fe0e62c25ab05bcb2cac640c2c3ed591a3a8..1a1108196261e9d2b5792d74f81cc0a1f07bc53a 100755 (executable)
@@ -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)