- remove everything, we'll merge PHP 5.4 into clean repo

[packages/php.git] / fix-test-run.patch

diff --git a/fix-test-run.patch b/fix-test-run.patch
deleted file mode 100644 (file)
index aa13506..0000000
--- a/fix-test-run.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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)
- 
-+# shift so that pcre, spl, ... 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-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 @@
-               done; \
-       fi
- 
--PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
-+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_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; \
-       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 @@
-               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); \
-               rm $(top_builddir)/tmp-php.ini; \
-       else \
-               echo "ERROR: Cannot run tests without CLI sapi."; \