summaryrefslogtreecommitdiff
path: root/Makefile.global
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2009-11-27 23:34:36 (GMT)
committerJani Taskinen <jani@php.net>2009-11-27 23:34:36 (GMT)
commit47a9c71dcc217ef2a8e906c8e49decc69873d0df (patch)
tree470f0b560045b6d545a8a5290266e6fd283bb5a9 /Makefile.global
parent7957efe4d49ce8858661161ac4488c4e226ed7c2 (diff)
downloadphp-47a9c71dcc217ef2a8e906c8e49decc69873d0df.tar.gz
- Fixed bug #49935 (Deprecated warnings make "make test" to fail)
Diffstat (limited to 'Makefile.global')
-rw-r--r--Makefile.global5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global
index 0c9b475..4f7d6d9 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -79,19 +79,20 @@ PHP_TEST_SHARED_EXTENSIONS = ` \
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
done; \
fi`
+PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
test: all
-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
if test "$$INI_FILE"; then \
- $(EGREP) -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
else \
echo > $(top_builddir)/tmp-php.ini; \
fi; \
INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
if test "$$INI_SCANNED_PATH"; then \
INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
- $(EGREP) -h -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \