summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/tests.py17
1 files changed, 7 insertions, 10 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index b36f43bb4b..08236c8744 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -20,9 +20,16 @@
import os, sys
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../selftest"))
+import selftesthelpers
from selftesthelpers import *
import subprocess
+print >>sys.stderr, "OPTIONS %s" % " ".join(smbtorture4_options)
+
+def plansmbtorture4testsuite(name, env, options, modname=None):
+ return selftesthelpers.plansmbtorture4testsuite(name, env, options,
+ target='samba4', modname=modname)
+
samba4srcdir = source4dir()
samba4bindir = bindir()
validate = os.getenv("VALIDATE", "")
@@ -38,16 +45,6 @@ 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",
- "--format=subunit"]
-torture_options.extend(get_env_torture_options())
-smbtorture4 += " " + " ".join(torture_options)
-
-print >>sys.stderr, "OPTIONS %s" % " ".join(torture_options)
-
# Simple tests for LDAP and CLDAP
for options in ['-U"$USERNAME%$PASSWORD" --option=socket:testnonblock=true', '-U"$USERNAME%$PASSWORD"', '-U"$USERNAME%$PASSWORD" -k yes', '-U"$USERNAME%$PASSWORD" -k no', '-U"$USERNAME%$PASSWORD" -k no --sign', '-U"$USERNAME%$PASSWORD" -k no --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --sign']:
plantestsuite("samba4.ldb.ldap with options %s(dc)" % options, "dc", "%s/test_ldb.sh ldap $SERVER %s" % (bbdir, options))