com php-src: Revert "Fix #77609: Tests from mailparse extension fails": Makefile.global
| From: | Remi Collet | Date: | Wed, 20 Mar 2019 11:21:25 +0000 |
| Subject: | com php-src: Revert "Fix #77609: Tests from mailparse extension fails": Makefile.global | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105274@lists.php.net to get a copy of this message | ||
Commit: eb279fdb16405acc55ac9376b2dc109e1eda865c
Author: Remi Collet <remi@php.net> Wed, 20 Mar 2019 12:21:25 +0100
Parents: 0a9769b03e6dcac3f4098f65c76b072479eee769
Branches: PHP-7.2.17
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb279fdb16405acc55ac9376b2dc109e1eda865c
Log:
Revert "Fix #77609: Tests from mailparse extension fails"
This reverts commit 3ead67239419632eecb83f0f101ead2021ee6c14.
Bugs:
https://bugs.php.net/77609
Changed paths:
M Makefile.global
Diff:
diff --git a/Makefile.global b/Makefile.global
index 377cae17..5728060 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -83,21 +83,20 @@ PHP_TEST_SHARED_EXTENSIONS = ` \
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d
$(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
done; \
fi`
-PHP_FILTERED_DIRECTIVES_REGEX =
'^(magic_quotes_(gpc|runtime|sybase)?|zend_extension(_debug)?(_ts)?)[\t\ ]*='
-PHP_EXTENSION_PATH_FIX_REGEX = "/^extension *= *[^/]/s,extension *=
*,extension=$(EXTENSION_DIR)/,g"
+PHP_DEPRECATED_DIRECTIVES_REGEX =
'^(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) -h -v $(PHP_FILTERED_DIRECTIVES_REGEX) "$$INI_FILE" | $(SED)
$(PHP_EXTENSION_PATH_FIX_REGEX) > $(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 $(PHP_FILTERED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini | $(SED)
$(PHP_EXTENSION_PATH_FIX_REGEX) >> $(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) \