hholzgra Tue Aug 2 13:05:02 2005 EDT
Modified files:
/php-src run-tests.php
Log:
make skipif test use ini options specified by -d command line options
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.224&r2=1.225&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.224 php-src/run-tests.php:1.225
--- php-src/run-tests.php:1.224 Fri Jul 29 13:25:38 2005
+++ php-src/run-tests.php Tue Aug 2 13:05:01 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.224 2005/07/29 17:25:38 helly Exp $ */
+/* $Id: run-tests.php,v 1.225 2005/08/02 17:05:01 hholzgra Exp $ */
/*
* TODO:
@@ -822,10 +822,14 @@
$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";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
