MFH Bugfix #28229 (PATCH run-tests tripped up by spaces in names)

diff --git a/NEWS b/NEWS
index c63caa8598a87fe738d350bbf5e9762fca6b5126..263036bde818f502033ed00854762b90fa4cd5d7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP 4                                                                      NEWS
   then 1 character long. (Ilia)
 - Fixed handling of return values from storred procedures in mssql_execute()
   with multiple result sets returned. (Frank)
+- Fixed bug #28229 (run-tests tripped up by spaces in names). (Marcus)
 - Fixed bug #28228 (number_format() does not allow empty decimal separator).
   (Ilia)
 - Fixed bug #28196 (missing error constants in cURL extension). (Ilia)

diff --git a/run-tests.php b/run-tests.php
index c08cc5668249cc4fb5c9cf7a8763ea163691d3c1..fd494e417fe2d4b7b3fa7c5839415190444bf150 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -680,7 +680,7 @@ TEST $file
                putenv("CONTENT_TYPE=application/x-www-form-urlencoded");
                putenv("CONTENT_LENGTH=$content_length");
 
-               $cmd = "$php$ini_settings -f $tmp_file 2>&1 < $tmp_post";
+               $cmd = "$php$ini_settings -f \"$tmp_file\" 2>&1 < $tmp_post";
 
        } else {
 
@@ -688,7 +688,7 @@ TEST $file
                putenv("CONTENT_TYPE=");
                putenv("CONTENT_LENGTH=");
 
-               $cmd = "$php$ini_settings -f $tmp_file$args 2>&1";
+               $cmd = "$php$ini_settings -f \"$tmp_file\" $args 2>&1";
        }
 
        if (DETAILED) echo "