]> granicus.if.org Git - php/commitdiff
Simple fix that just quotes the filenames in run-tests to support paths with spaces.
authorRasmus Lerdorf <rasmus@php.net>
Sat, 28 Jan 2012 02:43:31 +0000 (02:43 +0000)
committerRasmus Lerdorf <rasmus@php.net>
Sat, 28 Jan 2012 02:43:31 +0000 (02:43 +0000)
Fixes bug #60734

run-tests.php

index 3e22a9556ec0b83e473bbd50a09b5a28304638d9..70c56b06987b0b55baf96c24f0137298b22afd60 100755 (executable)
@@ -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']) {