diff options
| author | Jani Taskinen <jani@php.net> | 2009-11-27 23:34:36 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-11-27 23:34:36 +0000 |
| commit | 47a9c71dcc217ef2a8e906c8e49decc69873d0df (patch) | |
| tree | 470f0b560045b6d545a8a5290266e6fd283bb5a9 | |
| parent | 7957efe4d49ce8858661161ac4488c4e226ed7c2 (diff) | |
| download | php-git-47a9c71dcc217ef2a8e906c8e49decc69873d0df.tar.gz | |
- Fixed bug #49935 (Deprecated warnings make "make test" to fail)
| -rw-r--r-- | Makefile.global | 5 | ||||
| -rw-r--r-- | main/main.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index 0c9b475038..4f7d6d9e9b 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) \ diff --git a/main/main.c b/main/main.c index 01a6b2b792..e553708cc2 100644 --- a/main/main.c +++ b/main/main.c @@ -2032,6 +2032,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod module_initialized = 1; /* Check for deprecated directives */ + /* NOTE: If you add anything here, remember to add it also in Makefile.global! */ { static const char *directives[] = { "define_syslog_variables", |