summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-10-26 13:12:54 -0800
committerJelmer Vernooij <jelmer@samba.org>2012-10-27 05:16:18 -0800
commitfcb7926ce544a8d4b0e5aa6577fe21712b38bb53 (patch)
tree29dcedf492f0c540623bac99b9cc7a321d06be86 /source4
parent6bcb25673bdc249f5a49ded912d90bc84b13809d (diff)
downloadsamba-fcb7926ce544a8d4b0e5aa6577fe21712b38bb53.tar.gz
samba-fcb7926ce544a8d4b0e5aa6577fe21712b38bb53.tar.bz2
samba-fcb7926ce544a8d4b0e5aa6577fe21712b38bb53.zip
selftest/selftesthelpers: Share environment handling for extra smbtorture options.
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/selftest/tests.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 7f10cd1652..b36f43bb4b 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -38,12 +38,12 @@ subprocess.call([smbtorture4, "-V"], stdout=sys.stderr)
bbdir = os.path.join(srcdir(), "testprogs/blackbox")
-torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME", "--target=samba4", "--basedir=$SELFTEST_TMPDIR"]
-if not os.getenv("SELFTEST_VERBOSE"):
- torture_options.append("--option=torture:progress=no")
-torture_options.append("--format=subunit")
-if os.getenv("SELFTEST_QUICK"):
- torture_options.append("--option=torture:quick=yes")
+torture_options = [configuration,
+ "--maximum-runtime=$SELFTEST_MAXTIME",
+ "--target=samba4",
+ "--basedir=$SELFTEST_TMPDIR",
+ "--format=subunit"]
+torture_options.extend(get_env_torture_options())
smbtorture4 += " " + " ".join(torture_options)
print >>sys.stderr, "OPTIONS %s" % " ".join(torture_options)