diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2012-01-28 02:43:31 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2012-01-28 02:43:31 +0000 |
| commit | 6e77fce6a6bb6ba5dc69a5be13d8874f99bccf51 (patch) | |
| tree | 4b22734f13bdc81c1ffd33a7346f813d77eb60d0 | |
| parent | 614c22e10501abd7a704bb0f0b3b02852d9f0402 (diff) | |
| download | php-git-6e77fce6a6bb6ba5dc69a5be13d8874f99bccf51.tar.gz | |
Simple fix that just quotes the filenames in run-tests to support paths with spaces.
Fixes bug #60734
| -rwxr-xr-x | run-tests.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/run-tests.php b/run-tests.php index 3e22a9556e..70c56b0698 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1518,7 +1518,7 @@ TEST $file if ($JUNIT) { $test_started_at = microtime(true); } - $output = system_with_timeout("$extra $php $pass_options -q $ini_settings -d display_errors=0 $test_skipif", $env); + $output = system_with_timeout("$extra $php $pass_options -q $ini_settings -d display_errors=0 \"$test_skipif\"", $env); if ($JUNIT) { $test_finished_at = microtime(true); $test_execution_time= number_format($test_finished_at-$test_started_at, 2); @@ -1713,7 +1713,7 @@ TEST $file } save_text($tmp_post, $request); - $cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 < $tmp_post"; + $cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 < \"$tmp_post\""; } else if (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) { @@ -1734,7 +1734,7 @@ TEST $file $env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'; $env['CONTENT_LENGTH'] = $content_length; - $cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 < $tmp_post"; + $cmd = "$php $pass_options $ini_settings -f \"$test_file\" 2>&1 < \"$tmp_post\""; } else { @@ -1792,7 +1792,7 @@ COMMAND $cmd settings2params($clean_params); $extra = substr(PHP_OS, 0, 3) !== "WIN" ? "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": ""; - system_with_timeout("$extra $php $pass_options -q $clean_params $test_clean", $env); + system_with_timeout("$extra $php $pass_options -q $clean_params \"$test_clean\"", $env); } if (!$cfg['keep']['clean']) { |