summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-22 09:17:05 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-22 16:20:10 +1100
commit0b066b88dfbcc612089cdb5d971b7bb1bb7542ed (patch)
tree1cffb0e8fdfad317ec04d90459892ddd7ed8b0a0
parenta05679229438abb454660550b6d107ef4b6b6339 (diff)
downloadsamba-0b066b88dfbcc612089cdb5d971b7bb1bb7542ed.tar.gz
samba-0b066b88dfbcc612089cdb5d971b7bb1bb7542ed.tar.bz2
samba-0b066b88dfbcc612089cdb5d971b7bb1bb7542ed.zip
selftest split $PERL into multiple arguments for Test::More check
-rw-r--r--selftest/selftesthelpers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index e274cc4242..781c8ccb9a 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -34,8 +34,9 @@ def binpath(name):
return os.path.join(bindir(), "%s%s" % (name, os.getenv("EXEEXT", "")))
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
@@ -142,7 +143,7 @@ def planperltestsuite(name, path):
:param path: Path to the test runner
"""
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:
skiptestsuite(name, "Test::More not available")