diff options
author | Marcus Boerger <helly@php.net> | 2002-11-03 10:52:19 +0000 |
---|---|---|
committer | Marcus Boerger <helly@php.net> | 2002-11-03 10:52:19 +0000 |
commit | ee7f37ae58ad0925e99b15a0365af5369c059cda (patch) | |
tree | 57ae45994be22de732708a83d22283b049aa4d4f /run-tests.php | |
parent | 941d5e38948e8e46dec10b0b0f3bc7ec28cf7a80 (diff) | |
download | php-git-ee7f37ae58ad0925e99b15a0365af5369c059cda.tar.gz |
pass params used for info call to skipif also
#try php.ini with
#output_handler=mb_string
#mbstring.http_output=UCS-2LE
Diffstat (limited to 'run-tests.php')
-rwxr-xr-x | run-tests.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/run-tests.php b/run-tests.php index c1baca5df8..4c15938788 100755 --- a/run-tests.php +++ b/run-tests.php @@ -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"; |