From: Hartmut Holzgraefe Date: Tue, 2 Aug 2005 17:05:01 +0000 (+0000) Subject: make skipif test use ini options specified by -d command line options X-Git-Tag: RELEASE_2_0_0~43 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46a669b7fa539b8861b43392cf387d934deefe3d;p=php make skipif test use ini options specified by -d command line options --- diff --git a/run-tests.php b/run-tests.php index 8cd3c70089..131ac964ad 100755 --- a/run-tests.php +++ b/run-tests.php @@ -822,10 +822,14 @@ TEST $file $warn = false; if (array_key_exists('SKIPIF', $section_text)) { if (trim($section_text['SKIPIF'])) { + $skipif_params = array(); + settings2array($ini_overwrites,$skipif_params); + settings2params($skipif_params); + save_text($tmp_skipif, $section_text['SKIPIF']); $extra = substr(PHP_OS, 0, 3) !== "WIN" ? "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": ""; - $output = system_with_timeout("$extra $php -q $info_params $tmp_skipif"); + $output = system_with_timeout("$extra $php -q $skipif_params $tmp_skipif"); @unlink($tmp_skipif); if (eregi("^skip", trim($output))) { echo "SKIP $tested";