diff options
| author | Hartmut Holzgraefe <hholzgra@php.net> | 2005-08-02 17:05:01 +0000 |
|---|---|---|
| committer | Hartmut Holzgraefe <hholzgra@php.net> | 2005-08-02 17:05:01 +0000 |
| commit | 46a669b7fa539b8861b43392cf387d934deefe3d (patch) | |
| tree | 017e9c0121c62f9abe5bcf38c39f4226df60f1e7 | |
| parent | 650cdaed123623ae64444a5d33a308069022b762 (diff) | |
| download | php-git-46a669b7fa539b8861b43392cf387d934deefe3d.tar.gz | |
make skipif test use ini options specified by -d command line options
| -rwxr-xr-x | run-tests.php | 6 |
1 files changed, 5 insertions, 1 deletions
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"; |