cvs: php4 / run-tests.php

helly Sat Aug 3 07:44:12 2002 EDT Modified files: /php4 run-tests.php Log: -additional section INI that allows to set special ini settings on call by adding '-c foo=bar' strings to php call. Each line must have format foo=bar. This of cause only works for cli version. -made sections SKIPIF,INI,GET,POST optional Index: php4/run-tests.php diff -u php4/run-tests.php:1.50 php4/run-tests.php:1.51 --- php4/run-tests.php:1.50 Sat Jun 22 20:37:16 2002 +++ php4/run-tests.php Sat Aug 3 07:44:12 2002 @@ -316,28 +316,39 @@ putenv("CONTENT_LENGTH="); // Check if test should be skipped. - - if (trim($section_text['SKIPIF'])) { - save_text($tmp_skipif, $section_text['SKIPIF']); - $output = $php $tmp_skipif; - @unlink($tmp_skipif); - if(trim($output)=='skip') { - echo "SKIP $tested\n"; - return 'SKIPPED'; + if (array_key_exists('SKIPIF', $section_text)) { + if (trim($section_text['SKIPIF'])) { + save_text($tmp_skipif, $section_text['SKIPIF']); + $output = $php $tmp_skipif; + @unlink($tmp_skipif); + if(trim($output)=='skip') { + echo "SKIP $tested\n"; + return 'SKIPPED'; + } } } + + // Any special ini settings + $ini_settings = ''; + if (array_key_exists('INI', $section_text)) { + foreach(preg_split( "/[\n\r]+/", $section_text['INI']) as $setting) + if (strlen($setting)) + $ini_settings .= " -d '$setting'"; + } // We've satisfied the preconditions - run the test! - save_text($tmp_file,$section_text['FILE']); - $query_string = trim($section_text['GET']); + if (array_key_exists('GET', $section_text)) + $query_string = trim($section_text['GET']); + else + $query_string = ''; putenv("REDIRECT_STATUS=1"); putenv("QUERY_STRING=$query_string"); putenv("PATH_TRANSLATED=$tmp_file"); putenv("SCRIPT_FILENAME=$tmp_file"); - if (!empty($section_text['POST'])) { + if (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) { $post = trim($section_text['POST']); save_text($tmp_post,$post); @@ -347,7 +358,7 @@ putenv("CONTENT_TYPE=application/x-www-form-urlencoded"); putenv("CONTENT_LENGTH=$content_length"); - $cmd = "$php -f $tmp_file 2>&1 < $tmp_post"; + $cmd = "$php$ini_settings -f $tmp_file 2>&1 < $tmp_post"; } else { @@ -355,7 +366,7 @@ putenv("CONTENT_TYPE="); putenv("CONTENT_LENGTH="); - $cmd = "$php -f $tmp_file 2>&1"; + $cmd = "$php$ini_settings -f $tmp_file 2>&1"; }