From fcb7926ce544a8d4b0e5aa6577fe21712b38bb53 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 26 Oct 2012 13:12:54 -0800
Subject: selftest/selftesthelpers: Share environment handling for extra
 smbtorture options.

---
 source4/selftest/tests.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source4/selftest/tests.py')

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)
-- 
cgit