X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=fix-test-run.patch;h=cde2b04855fbe168e1cc149a7921119d0069950d;hp=aa13506a39cd6f3e8cf92ee9a6c7673cd454518b;hb=954ecf20c48c9867c06e3142115d609ad4c9e81c;hpb=aef9a98d7828aeb48703ab2429a6968173d1addf

diff --git a/fix-test-run.patch b/fix-test-run.patch
index aa13506..cde2b04 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -1,20 +1,18 @@
---- php-5.3.2/configure.in~	2010-03-16 12:16:56.000000000 +0200
-+++ php-5.3.2/configure.in	2010-03-16 16:13:24.926435546 +0200
-@@ -1224,6 +1224,11 @@
- PHP_SUBST(PHP_CLI_OBJS)
- PHP_SUBST(PHP_GLOBAL_OBJS)
+--- 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 @@
+   AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
+ fi
  
-+# 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(PHP_MODULES)
- PHP_SUBST(PHP_ZEND_EX)
+ PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
  
---- php-5.3.8/Makefile.global~	2011-10-14 08:58:00.288329595 +0300
-+++ php-5.3.8/Makefile.global	2011-10-14 08:50:16.670234576 +0300
-@@ -77,8 +77,15 @@
+ PHP_SUBST(PHP_FASTCGI_OBJS)
+--- 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
  
@@ -31,15 +29,14 @@
  	if test "x$(PHP_MODULES)" != "x"; then \
  		for i in $(PHP_MODULES)""; do \
  			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-@@ -107,7 +114,10 @@
+@@ -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=$$?; \
  		rm $(top_builddir)/tmp-php.ini; \
- 	else \
- 		echo "ERROR: Cannot run tests without CLI sapi."; \
+ 		exit $$TEST_RESULT_EXIT_CODE; \