dmitry Wed Jul 4 10:15:49 2007 UTC
Modified files:
/php-src Makefile.global run-tests.php
Log:
Fixed "make test"
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.82&r2=1.83&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.82 php-src/Makefile.global:1.83
--- php-src/Makefile.global:1.82 Tue Jul 3 15:56:43 2007
+++ php-src/Makefile.global Wed Jul 4 10:15:47 2007
@@ -98,22 +98,32 @@
utest: all
[EMAIL PROTECTED] test ! -z "$(SAPI_CLI_PATH)" && test -x
"$(SAPI_CLI_PATH)"; then \
- $(EGREP) -v '^extension[\t\ ]='
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ?
php_ini_loaded_file() : "no_ini_file";'` > $(top_builddir)/tmp-php.ini; \
+ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo
php_ini_loaded_file();'`; \
+ if test "$$INI_FILE"; then \
+ $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" >
$(top_builddir)/tmp-php.ini; \
+ else \
+ echo > $(top_builddir)/tmp-php.ini; \
+ fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -u -d extension_dir=$(top_builddir)/modules/
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+ $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -u -d
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
ntest: all
[EMAIL PROTECTED] test ! -z "$(SAPI_CLI_PATH)" && test -x
"$(SAPI_CLI_PATH)"; then \
- $(EGREP) -v '^extension[\t\ ]='
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ?
php_ini_loaded_file() : "no_ini_file";'` > $(top_builddir)/tmp-php.ini; \
+ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo
php_ini_loaded_file();'`; \
+ if test "$$INI_FILE"; then \
+ $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" >
$(top_builddir)/tmp-php.ini; \
+ else \
+ echo > $(top_builddir)/tmp-php.ini; \
+ fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -N -d extension_dir=$(top_builddir)/modules/
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+ $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -N -d
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.327&r2=1.328&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.327 php-src/run-tests.php:1.328
--- php-src/run-tests.php:1.327 Fri Jun 29 09:49:40 2007
+++ php-src/run-tests.php Wed Jul 4 10:15:47 2007
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.327 2007/06/29 09:49:40 dmitry Exp $ */
+/* $Id: run-tests.php,v 1.328 2007/07/04 10:15:47 dmitry Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -407,7 +407,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.327 $'."\n";
+ echo '$Revision: 1.328 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -1231,7 +1231,7 @@
$env['USE_ZEND_ALLOC'] = '1';
}
- $output = system_with_timeout("$extra $php -q
$ini_settings $test_skipif", $env);
+ $output = system_with_timeout("$extra $php
$pass_options -q $ini_settings $test_skipif", $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
}
@@ -1462,7 +1462,7 @@
settings2params($clean_params);
$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
"unset REQUEST_METHOD; unset
QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset
REQUEST_METHOD;": "";
- system_with_timeout("$extra $php -q
$clean_params $test_clean", $env);
+ system_with_timeout("$extra $php $pass_options
-q $clean_params $test_clean", $env);
}
if (!$cfg['keep']['clean']) {
@unlink($test_clean);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
