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

--- 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.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
+++ php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
@@ -77,7 +77,8 @@
 		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 = pcre
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \
@@ -88,6 +89,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 = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
 
@@ -320,7 +327,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); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
--- php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
+++ php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
@@ -296,7 +296,7 @@
 	fi
 
 PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
-PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre
+PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
 PHP_TEST_SHARED_EXTENSIONS =  ` \
 	if test "x$(PHP_MODULES)" != "x"; then \
 		for i in $(PHP_MODULES)""; do \
--- php-5.3.2/Makefile.gcov	2010-03-16 16:31:36.972576955 +0200
+++ php-5.3.2/Makefile.gcov	2010-03-16 16:31:36.972576955 +0200
@@ -376,11 +376,25 @@
 	@echo "Running test suite"
 	@find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
 	-@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_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_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+		fi; \
 		NO_INTERACTION=1 \
 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 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); \
 	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
 		NO_INTERACTION=1 \
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
Commit	Line	Data
71f4af01 ER	1	--- php-5.3.2/configure.in~ 2010-03-16 12:16:56.000000000 +0200
	2	+++ php-5.3.2/configure.in 2010-03-16 16:13:24.926435546 +0200
	3	@@ -1224,6 +1224,11 @@
	4	PHP_SUBST(PHP_CLI_OBJS)
	5	PHP_SUBST(PHP_GLOBAL_OBJS)
	6
	7	+# shift so that pcre, spl, ... are loaded first
	8	+PHP_MODULES=$(echo "$PHP_MODULES" \| sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
	9	+PHP_MODULES=$(echo "$PHP_MODULES" \| sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,')
	10	+PHP_MODULES=$(echo "$PHP_MODULES" \| sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,')
	11	+
	12	PHP_SUBST(PHP_MODULES)
	13	PHP_SUBST(PHP_ZEND_EX)
	14
2cc4a4cc	15	--- php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
71f4af01	16	+++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
2cc4a4cc	17	@@ -77,7 +77,8 @@
71f4af01 ER	18	done; \
	19	fi
	20
	21	-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
	22	+PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
2cc4a4cc	23	+PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre
71f4af01 ER	24	PHP_TEST_SHARED_EXTENSIONS = ` \
	25	if test "x$(PHP_MODULES)" != "x"; then \
	26	for i in $(PHP_MODULES)""; do \
2cc4a4cc ER	27	@@ -88,6 +89,12 @@
	28	for i in $(PHP_ZEND_EX)""; do \
	29	. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
	30	done; \
	31	+ fi; \
	32	+ if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
	33	+ for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
	34	+ dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
	35	+ $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \
	36	+ done; \
	37	fi`
	38	PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables\|register_(globals\|long_arrays)?\|safe_mode\|magic_quotes_(gpc\|runtime\|sybase)?\|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
	39
	40	@@ -320,7 +327,10 @@
71f4af01 ER	41	TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
	42	TEST_PHP_SRCDIR=$(top_srcdir) \
	43	CC="$(CC)" \
	44	- $(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); \
	45	+ $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
6c033b2c	46	+ -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
71f4af01	47	+ $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
1291fa93	48	+ -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
71f4af01 ER	49	else \
	50	echo "ERROR: Cannot run tests without CLI sapi."; \
	51	fi
b1558782 ER	52	--- php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
	53	+++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
	54	@@ -296,7 +296,7 @@
	55	fi
	56
	57	PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
	58	-PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre
	59	+PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
	60	PHP_TEST_SHARED_EXTENSIONS = ` \
	61	if test "x$(PHP_MODULES)" != "x"; then \
	62	for i in $(PHP_MODULES)""; do \
	63	--- php-5.3.2/Makefile.gcov 2010-03-16 16:31:36.972576955 +0200
	64	+++ php-5.3.2/Makefile.gcov 2010-03-16 16:31:36.972576955 +0200
	65	@@ -376,11 +376,25 @@
	66	@echo "Running test suite"
	67	@find . -name \.gcda -o -name \.da -o -name \*.bbg? \| xargs rm -f
	68	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
	69	+ INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
	70	+ if test "$$INI_FILE"; then \
	71	+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
	72	+ else \
	73	+ echo > $(top_builddir)/tmp-php.ini; \
	74	+ fi; \
	75	+ INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
	76	+ if test "$$INI_SCANNED_PATH"; then \
	77	+ INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
	78	+ $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
	79	+ fi; \
	80	NO_INTERACTION=1 \
	81	TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
	82	TEST_PHP_SRCDIR=$(top_srcdir) \
	83	CC="$(CC)" \
	84	- $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
	85	+ $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
	86	+ -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
	87	+ $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
	88	+ -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
	89	elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
	90	NO_INTERACTION=1 \
	91	TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \