tony2001                Wed Aug 23 07:03:00 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    run-tests.php 
  Log:
  MFH: make run-tests to work with directories containing spaces (bug #38558)
  Patch by danielc at analysisandsolutions dot com
  
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.13&r2=1.226.2.37.2.14&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.13 
php-src/run-tests.php:1.226.2.37.2.14
--- php-src/run-tests.php:1.226.2.37.2.13       Tue Aug 22 05:00:51 2006
+++ php-src/run-tests.php       Wed Aug 23 07:02:59 2006
@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.13 2006/08/22 05:00:51 dmitry Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.14 2006/08/23 07:02:59 tony2001 Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -192,13 +192,13 @@
        $info_params = array();
        settings2array($ini_overwrites,$info_params);
        settings2params($info_params);
-       $php_info = `$php $pass_options $info_params $info_file`;
+       $php_info = `$php $pass_options $info_params "$info_file"`;
        @unlink($info_file);
-       define('TESTED_PHP_VERSION', `$php -r 'echo PHP_VERSION;'`);
+       define('TESTED_PHP_VERSION', `$php -r "echo PHP_VERSION;"`);
 
        // load list of enabled extensions
        save_text($info_file, '<?php echo join(",",get_loaded_extensions()); 
?>');
-       $exts_to_test = explode(',',`$php $pass_options $info_params 
$info_file`);
+       $exts_to_test = explode(',',`$php $pass_options $info_params 
"$info_file"`);
        // check for extensions that need special handling and regenerate
        $info_params_ex = array(
                'session' => array('session.auto_start=0'),
@@ -397,7 +397,7 @@
                                        $html_output = is_resource($html_file);
                                        break;
                                case '--version':
-                                       echo '$Revision: 1.226.2.37.2.13 
$'."\n";
+                                       echo '$Revision: 1.226.2.37.2.14 
$'."\n";
                                        exit(1);
                                default:
                                        echo "Illegal switch '$switch' 
specified!\n";

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to