diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-11-01 07:09:00 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-03-24 04:51:14 +0100 |
| commit | 502f424a15040c812f4892aa50c4d768bc978f80 (patch) | |
| tree | 39309e2e5d9ac02fce47b332017ef83f01aadb99 /selftest | |
| parent | c845ccb5bb2de3007bd3b2ce9664f22235fce0c6 (diff) | |
| download | samba-502f424a15040c812f4892aa50c4d768bc978f80.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
(cherry picked from commit 2c67d55614668583dc6290c6db86d5229fb654ea)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/filter-subunit | 2 | ||||
| -rwxr-xr-x | selftest/format-subunit | 2 | ||||
| -rw-r--r-- | selftest/selftesthelpers.py | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/selftest/filter-subunit b/selftest/filter-subunit index 5b74343562a..2ce9584c2a5 100755 --- a/selftest/filter-subunit +++ b/selftest/filter-subunit @@ -25,6 +25,8 @@ import signal sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/subunit/python")) sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/testtools")) +sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/mimeparse")) +sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/extras")) import subunithelper diff --git a/selftest/format-subunit b/selftest/format-subunit index b927e95ae48..5da56beb090 100755 --- a/selftest/format-subunit +++ b/selftest/format-subunit @@ -11,6 +11,8 @@ import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/subunit/python")) sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/testtools")) +sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/mimeparse")) +sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/extras")) import subunithelper diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index d1b3e1339e0..352595e605a 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -69,7 +69,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) @@ -173,8 +174,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)) |