diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-11-01 07:09:00 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2014-11-22 04:44:11 +0100 |
| commit | 2c67d55614668583dc6290c6db86d5229fb654ea (patch) | |
| tree | 05129fa9c5ac8376e534087bc9f7989d07d5b3bc /selftest/selftesthelpers.py | |
| parent | d857e7b1a7a2cc1f7f4f9f2ffd5a11f8c627ae39 (diff) | |
| download | samba-2c67d55614668583dc6290c6db86d5229fb654ea.tar.gz | |
Include mimeparse, which is used by subunit/testtools.
Change-Id: I984c82acc0bc82a165e8ea17d8948c465c786905
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Sat Nov 22 04:44:11 CET 2014 on sn-devel-104
Diffstat (limited to 'selftest/selftesthelpers.py')
| -rw-r--r-- | selftest/selftesthelpers.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 05f8ae3be06..502ba1079bc 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -68,7 +68,8 @@ else: 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()) +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", stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) @@ -172,8 +173,11 @@ def planpythontestsuite(env, module, name=None, extra_path=[]): name = module pypath = list(extra_path) if not has_system_subunit_run: - pypath.extend(["%s/lib/subunit/python" % srcdir(), - "%s/lib/testtools" % srcdir()]) + 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", module] if pypath: args.insert(0, "PYTHONPATH=%s" % ":".join(["$PYTHONPATH"] + pypath)) |