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

diff --git a/fix-test-run.patch b/fix-test-run.patch
index fcdbc71..01742c4 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -1,13 +1,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,11 @@
+@@ -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)
  
@@ -31,13 +29,12 @@
  	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,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=$$?; \