sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

selftesthelpers: Cope with empty binary mappings list, simplify handling of perl.

Browse Source
This commit is contained in:
Jelmer Vernooij 2011-11-13 21:51:53 +01:00
parent 17c529a35f
commit 38495995c9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
selftest/selftesthelpers.py
View File

@ -40,13 +40,15 @@ def binpath(name):
binary_mapping_string = os.getenv("BINARY_MAPPING", None)
if binary_mapping_string is not None:
for binmapping_entry in binary_mapping_string.split(','):
binmapping = binmapping_entry.split(':')
binary_mapping[binmapping[0]] = binmapping[1]
try:
(from_path, to_path) = binmapping_entry.split(':', 1)
except ValueError:
continue
binary_mapping[from_path] = to_path
perl = os.getenv("PERL", "perl")
perl = perl.split()
if subprocess.call(perl + ["-e", "eval require Test::More;"]) == 0:
if subprocess.call([perl, "-e", "eval require Test::More;"]) == 0:
has_perl_test_more = True
else:
has_perl_test_more = False
@ -157,7 +159,7 @@ def planperltestsuite(name, path):
:param path: Path to the test runner
"""
if has_perl_test_more:
plantestsuite(name, "none", "%s %s | %s" % (" ".join(perl), path, tap2subunit))
plantestsuite(name, "none", "%s %s | %s" % (perl, path, tap2subunit))
else:
skiptestsuite(name, "Test::More not available")