diff options
| author | foobar <sniper@php.net> | 2007-06-09 11:52:49 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2007-06-09 11:52:49 +0000 |
| commit | c6c2c4a40366fb92a71c09c940d321b1fa4bdebd (patch) | |
| tree | d50450b07ed8c617e5d6fdce033630d3b277ad0f /Makefile.global | |
| parent | 53b43a63cd1d66cc92fa5e1b45a830b9206a6901 (diff) | |
| download | php-git-c6c2c4a40366fb92a71c09c940d321b1fa4bdebd.tar.gz | |
- fix "make test" issue with extension entries
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.global b/Makefile.global index ddd8c4744d..ea0548af8d 100644 --- a/Makefile.global +++ b/Makefile.global @@ -77,6 +77,7 @@ test: all 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 @@ test: all 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 @@ utest: all 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)" \ |