File php-4.3.1-tests.patch of Package php4 - j0ke.net Open Build Service

File php-4.3.1-tests.patch of Package php4 (Revision 964e45380f171ff82414dec834aaf5b8)

Currently displaying revision 964e45380f171ff82414dec834aaf5b8, show latest

Pass -n to php when running tests, to ensure that the system inidir
and hence old modules aren't picked up.

Try and fix the bug22414 test: still fails though.

--- php-4.3.7/Makefile.global.tests
+++ php-4.3.7/Makefile.global
@@ -51,11 +51,11 @@
 install-su: install-pear install-tester
 
 test: 
-	-@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
+	@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
-			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
+			$(top_builddir)/$(SAPI_CLI_PATH) -n -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi
--- php-4.3.7/run-tests.php.tests
+++ php-4.3.7/run-tests.php
@@ -113,6 +113,10 @@
 	error("invalid PHP executable specified by TEST_PHP_EXECUTABLE  = " . $php);
 }
 
+// Don't scan system ini files, this may load in extensions from the
+// system /usr/lib/php4 (which may be broken, or an old version, or...)
+$php .= " -n ";
+
 // Check whether a detailed log is wanted.
 if (getenv('TEST_PHP_DETAILED')) {
 	define('DETAILED', getenv('TEST_PHP_DETAILED'));