import os
import subprocess
+import sys
def srcdir():
return os.path.normpath(os.getenv("SRCDIR", os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")))
def source4dir():
return os.path.normpath(os.path.join(srcdir(), "source4"))
+def source3dir():
+ return os.path.normpath(os.path.join(srcdir(), "source3"))
+
def bindir():
return os.path.normpath(os.getenv("BINDIR", "./bin"))
def binpath(name):
if name in binary_mapping:
name = binary_mapping[name]
- return os.path.join(bindir(), "%s%s" % (name, os.getenv("EXEEXT", "")))
+ return os.path.join(bindir(), name)
binary_mapping_string = os.getenv("BINARY_MAPPING", None)
if binary_mapping_string is not None:
python = os.getenv("PYTHON", "python")
-#Set a default value, overridden if we find a working one on the system
-tap2subunit = "PYTHONPATH=%s/lib/subunit/python:%s/lib/testtools %s %s/lib/subunit/filters/tap2subunit" % (srcdir(), srcdir(), python, srcdir())
+# Set a default value, overridden if we find a working one on the system
+tap2subunit = "PYTHONPATH=%s/lib/subunit/python:%s/lib/testtools:%s/lib/extras:%s/lib/mimeparse %s %s/lib/subunit/filters/tap2subunit" % (srcdir(), srcdir(), srcdir(), srcdir(), python, srcdir())
+subunit2to1 = "PYTHONPATH=%s/lib/subunit/python:%s/lib/testtools:%s/lib/extras:%s/lib/mimeparse %s %s/lib/subunit/filters/subunit-2to1" % (srcdir(), srcdir(), srcdir(), srcdir(), python, srcdir())
-sub = subprocess.Popen("tap2subunit 2> /dev/null", stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
+sub = subprocess.Popen("tap2subunit", stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
sub.communicate("")
if sub.returncode == 0:
- cmd = "echo -ne \"1..1\nok 1 # skip doesn't seem to work yet\n\" | tap2subunit 2> /dev/null | grep skip"
- sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+ cmd = "echo -ne \"1..1\nok 1 # skip doesn't seem to work yet\n\" | tap2subunit | grep skip"
+ sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
+ stderr=subprocess.PIPE, shell=True)
if sub.returncode == 0:
tap2subunit = "tap2subunit"
+def to_subunit1(subunit_version):
+ if subunit_version == 1:
+ return ""
+ return " | " + subunit2to1
+
+
def valgrindify(cmdline):
"""Run a command under valgrind, if $VALGRIND was set."""
valgrind = os.getenv("VALGRIND")
return valgrind + " " + cmdline
-def plantestsuite(name, env, cmdline, allow_empty_output=False):
+def plantestsuite(name, env, cmdline, subunit_version=1):
"""Plan a test suite.
:param name: Testsuite name
print env
if isinstance(cmdline, list):
cmdline = " ".join(cmdline)
- filter_subunit_args = []
- if not allow_empty_output:
- filter_subunit_args.append("--fail-on-empty")
if "$LISTOPT" in cmdline:
- filter_subunit_args.append("$LISTOPT")
- print "%s 2>&1 | %s/selftest/filter-subunit %s --prefix=\"%s.\"" % (cmdline,
- srcdir(),
- " ".join(filter_subunit_args),
- name)
- if allow_empty_output:
- print "WARNING: allowing empty subunit output from %s" % name
+ raise AssertionError("test %s supports --list, but not --load-list" % name)
+ print cmdline + " 2>&1 " + to_subunit1(subunit_version) + " | " + add_prefix(name, env)
-def add_prefix(prefix, support_list=False):
+def add_prefix(prefix, env, support_list=False):
if support_list:
listopt = "$LISTOPT "
else:
listopt = ""
- return "%s/selftest/filter-subunit %s--fail-on-empty --prefix=\"%s.\"" % (srcdir(), listopt, prefix)
+ return "%s/selftest/filter-subunit %s--fail-on-empty --prefix=\"%s.\" --suffix=\"(%s)\"" % (srcdir(), listopt, prefix, env)
-def plantestsuite_loadlist(name, env, cmdline):
+def plantestsuite_loadlist(name, env, cmdline, subunit_version=1):
print "-- TEST-LOADLIST --"
if env == "none":
fullname = name
if isinstance(cmdline, list):
cmdline = " ".join(cmdline)
support_list = ("$LISTOPT" in cmdline)
- print "%s $LOADLIST 2>&1 | %s" % (cmdline, add_prefix(name, support_list))
-
-
-def plantestsuite_idlist(name, env, cmdline):
- print "-- TEST-IDLIST --"
- if env == "none":
- fullname = name
- else:
- fullname = "%s(%s)" % (name, env)
- print fullname
- print env
- if isinstance(cmdline, list):
- cmdline = " ".join(cmdline)
- print cmdline
+ if not "$LISTOPT" in cmdline:
+ raise AssertionError("loadlist test %s does not support not --list" % name)
+ if not "$LOADLIST" in cmdline:
+ raise AssertionError("loadlist test %s does not support --load-list" % name)
+ print ("%s | %s" % (cmdline.replace("$LOADLIST", ""), add_prefix(name, env, support_list))).replace("$LISTOPT", "--list")
+ print cmdline.replace("$LISTOPT", "") + " 2>&1 " + to_subunit1(subunit_version) + " | " + add_prefix(name, env, False)
def skiptestsuite(name, reason):
:param reason: Reason the test suite was skipped
"""
# FIXME: Report this using subunit, but re-adjust the testsuite count somehow
- print "skipping %s (%s)" % (name, reason)
+ print >>sys.stderr, "skipping %s (%s)" % (name, reason)
def planperltestsuite(name, path):
name = module
pypath = list(extra_path)
if not has_system_subunit_run:
- pypath.extend(["%s/lib/subunit/python" % srcdir(),
- "%s/lib/testtools" % srcdir()])
- args = [python, "-m", "subunit.run", "$LISTOPT", module]
+ pypath.extend([
+ "%s/lib/subunit/python" % srcdir(),
+ "%s/lib/testtools" % srcdir(),
+ "%s/lib/extras" % srcdir(),
+ "%s/lib/mimeparse" % srcdir()])
+ args = [python, "-m", "subunit.run", "$LISTOPT", "$LOADLIST", module]
if pypath:
args.insert(0, "PYTHONPATH=%s" % ":".join(["$PYTHONPATH"] + pypath))
- plantestsuite_idlist(name, env, args)
+ plantestsuite_loadlist(name, env, args)
+
+
+def get_env_torture_options():
+ ret = []
+ if not os.getenv("SELFTEST_VERBOSE"):
+ ret.append("--option=torture:progress=no")
+ if os.getenv("SELFTEST_QUICK"):
+ ret.append("--option=torture:quick=yes")
+ return ret
+
+
+samba4srcdir = source4dir()
+samba3srcdir = source3dir()
+bbdir = os.path.join(srcdir(), "testprogs/blackbox")
+configuration = "--configfile=$SMB_CONF_PATH"
+
+smbtorture4 = binpath("smbtorture4")
+smbtorture4_testsuite_list = subprocess.Popen([smbtorture4, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines()
+
+smbtorture4_options = [
+ configuration,
+ "--maximum-runtime=$SELFTEST_MAXTIME",
+ "--basedir=$SELFTEST_TMPDIR",
+ "--format=subunit"
+ ] + get_env_torture_options()
+
+
+def plansmbtorture4testsuite(name, env, options, target, modname=None):
+ if modname is None:
+ modname = "samba4.%s" % name
+ if isinstance(options, list):
+ options = " ".join(options)
+ options = " ".join(smbtorture4_options + ["--target=%s" % target]) + " " + options
+ cmdline = "%s $LISTOPT $LOADLIST %s %s" % (valgrindify(smbtorture4), options, name)
+ plantestsuite_loadlist(modname, env, cmdline)
+
+
+def smbtorture4_testsuites(prefix):
+ return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
+
+
+smbclient3 = binpath('smbclient3')
+smbtorture3 = binpath('smbtorture3')
+ntlm_auth3 = binpath('ntlm_auth3')
+net = binpath('net')
+scriptdir = os.path.join(srcdir(), "script/tests")
+
+wbinfo = binpath('wbinfo')
+dbwrap_tool = binpath('dbwrap_tool')
+vfstest = binpath('vfstest')
git.samba.org / obnox / samba / samba-obnox.git / blobdiff