Commit abc6c6a3 authored by alexpott's avatar alexpott

Issue #2635046 by neclimdul, dawehner, alexpott: run-test.sh doesn't work in...

Issue #2635046 by neclimdul, dawehner, alexpott: run-test.sh doesn't work in directories with spaces
parent cdbb68bb
...@@ -389,12 +389,12 @@ function simpletest_phpunit_command() { ...@@ -389,12 +389,12 @@ function simpletest_phpunit_command() {
// The file in Composer's bin dir is a *nix link, which does not work when // The file in Composer's bin dir is a *nix link, which does not work when
// extracted from a tarball and generally not on Windows. // extracted from a tarball and generally not on Windows.
$command = $vendor_dir . '/phpunit/phpunit/phpunit'; $command = escapeshellarg($vendor_dir . '/phpunit/phpunit/phpunit');
if (substr(PHP_OS, 0, 3) == 'WIN') { if (substr(PHP_OS, 0, 3) == 'WIN') {
// On Windows it is necessary to run the script using the PHP executable. // On Windows it is necessary to run the script using the PHP executable.
$php_executable_finder = new PhpExecutableFinder(); $php_executable_finder = new PhpExecutableFinder();
$php = $php_executable_finder->find(); $php = $php_executable_finder->find();
$command = $php . ' -f ' . escapeshellarg($command) . ' --'; $command = $php . ' -f ' . $command . ' --';
} }
return $command; return $command;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment