cvs: php-src / Makefile.global

sniper Sat Jun 9 11:52:49 2007 UTC Modified files: /php-src Makefile.global Log: - fix "make test" issue with extension entries http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.73&r2=1.74&diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.73 php-src/Makefile.global:1.74 --- php-src/Makefile.global:1.73 Wed Jun 6 18:27:54 2007 +++ php-src/Makefile.global Sat Jun 9 11:52:49 2007 @@ -77,6 +77,7 @@ CC="$(CC)" \ $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ elif 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();' > $(top_builddir)/tmp-php.ini; \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ @@ -87,6 +88,7 @@ utest: all -@if 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();' > $(top_builddir)/tmp-php.ini; \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ @@ -97,6 +99,7 @@ ntest: all -@if 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();' > $(top_builddir)/tmp-php.ini; \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \