X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fix-test-run.patch;h=01742c44c830c5f49304b852f40087aeb68ee22e;hb=45629e6e9bbed84edb75f9580aabea932a696556;hp=feb4cb487d523aebd97fa1619e2c36d464973793;hpb=dc8e8c56871bfd166ca679dca6aac4bd04b342f7;p=packages%2Fphp.git

diff --git a/fix-test-run.patch b/fix-test-run.patch
index feb4cb4..01742c4 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -1,20 +1,18 @@
---- php-5.4.0alpha2/configure.in~	2011-08-07 12:43:31.000000000 +0300
-+++ php-5.4.0alpha2/configure.in	2011-08-07 12:44:11.495394662 +0300
-@@ -1271,6 +1271,11 @@
+--- php-5.4.0alpha2/configure.ac~	2011-08-07 12:43:31.000000000 +0300
++++ php-5.4.0alpha2/configure.ac	2011-08-07 12:44:11.495394662 +0300
+@@ -1271,6 +1271,9 @@
    ;;
  esac
  
-+# shift so that pcre, spl, ... are loaded first
++# shift so that extensions like xml are loaded first
 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
-+PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,')
-+PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,')
 +
  PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
  
  PHP_SUBST(PHP_EXECUTABLE)
---- php-5.5.11.pre/Makefile.global	2014-04-27 15:04:43.224682666 +0300
-+++ php-5.5.11/Makefile.global	2014-04-27 15:05:38.963814051 +0300
-@@ -81,7 +81,8 @@
+--- php-5.5.11/build/Makefile.global	2014-04-27 15:05:38.963814051 +0300
++++ php-5.5.11/build/Makefile.global	2014-04-27 15:09:54.438443707 +0300
+@@ -81,8 +81,15 @@
  		done; \
  	fi
  
@@ -22,28 +20,21 @@
 +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
 +PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
  PHP_TEST_SHARED_EXTENSIONS =  ` \
- 	if test "x$(PHP_MODULES)" != "x"; then \
- 		for i in $(PHP_MODULES)""; do \
-@@ -92,6 +93,12 @@
- 		for i in $(PHP_ZEND_EX)""; do \
- 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
- 		done; \
-+	fi; \
 +	if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
 +		for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
 +			dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
 +			$(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \
 +		done; \
- 	fi`
- PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
- 
-@@ -111,7 +118,10 @@
++	fi; \
+ 	if test "x$(PHP_MODULES)" != "x"; then \
+ 		for i in $(PHP_MODULES)""; do \
+ 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -111,7 +118,9 @@
  		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
  		TEST_PHP_SRCDIR=$(top_srcdir) \
  		CC="$(CC)" \
 -			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
 +			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
-+			-d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
 +			$(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
 +			-d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
  		TEST_RESULT_EXIT_CODE=$$?; \