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

selftesthelpers: Revert perl changes, add comment on why the original code was necessary.

Browse Source
This commit is contained in:
Jelmer Vernooij 2011-11-14 13:47:50 +01:00
parent 5cf31eb592
commit 042f3fe5f6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
selftest/selftesthelpers.py
View File

@ -46,9 +46,10 @@ if binary_mapping_string is not None:
continue continue
binary_mapping[from_path] = to_path binary_mapping[from_path] = to_path
perl = os.getenv("PERL", "perl") # Split perl variable to allow $PERL to be set to e.g. "perl -W"
perl = os.getenv("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 has_perl_test_more = True
else: else:
has_perl_test_more = False has_perl_test_more = False
@ -159,7 +160,7 @@ def planperltestsuite(name, path):
:param path: Path to the test runner :param path: Path to the test runner
""" """
if has_perl_test_more: if has_perl_test_more:
plantestsuite(name, "none", "%s %s | %s" % (perl, path, tap2subunit)) plantestsuite(name, "none", "%s %s | %s" % (" ".join(perl), path, tap2subunit))
else: else:
skiptestsuite(name, "Test::More not available") skiptestsuite(name, "Test::More not available")