helly           Sun Nov  3 05:52:19 2002 EDT

  Modified files:              
    /php4       run-tests.php 
  Log:
  pass params used for info call to skipif also
  #try php.ini with 
  #output_handler=mb_string
  #mbstring.http_output=UCS-2LE
  
  
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.110 php4/run-tests.php:1.111
--- php4/run-tests.php:1.110    Sat Nov  2 17:06:03 2002
+++ php4/run-tests.php  Sun Nov  3 05:52:19 2002
@@ -117,10 +117,10 @@
                'auto_append_file=',
                'disable_functions='
        );
-$params = array();
-settings2array($settings,$params);
-settings2params($params);
-$php_info = `$php $params $info_file`;
+$info_params = array();
+settings2array($settings,$info_params);
+settings2params($info_params);
+$php_info = `$php $info_params $info_file`;
 @unlink($info_file);
 
 // Write test context information.
@@ -427,7 +427,7 @@
 
 function run_test($php,$file)
 {
-       global $log_format;
+       global $log_format, $info_params;
 
        if (DETAILED) echo "
 =================
@@ -491,7 +491,7 @@
        if (array_key_exists('SKIPIF', $section_text)) {
                if (trim($section_text['SKIPIF'])) {
                        save_text($tmp_skipif, $section_text['SKIPIF']);
-                       $output = `$php $tmp_skipif`;
+                       $output = `$php $info_params $tmp_skipif`;
                        @unlink($tmp_skipif);
                        if (ereg("^skip", trim($output))){
                                echo "SKIP $tested";



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

Reply via email to