]> granicus.if.org Git - php/commitdiff
pass params used for info call to skipif also
authorMarcus Boerger <helly@php.net>
Sun, 3 Nov 2002 10:52:19 +0000 (10:52 +0000)
committerMarcus Boerger <helly@php.net>
Sun, 3 Nov 2002 10:52:19 +0000 (10:52 +0000)
#try php.ini with
#output_handler=mb_string
#mbstring.http_output=UCS-2LE

run-tests.php

index c1baca5df8f2edec1ce72f4d423fa23ebfe6a0f9..4c15938788a4ab1d4067ea6585ef6afdffef5ed1 100755 (executable)
@@ -117,10 +117,10 @@ $settings = array(
                '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 error_report($testname,$logname,$tested)
 
 function run_test($php,$file)
 {
-       global $log_format;
+       global $log_format, $info_params;
 
        if (DETAILED) echo "
 =================
@@ -491,7 +491,7 @@ TEST $file
        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";