mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 11:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simple fix that just quotes the filenames in run-tests to support paths with spaces.

Browse Source 
Fixes bug #60734
This commit is contained in:
Rasmus Lerdorf 2012-01-28 02:43:31 +00:00
parent f75f11857c
commit 510bb3131b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
run-tests.php
View File

@ -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']) {