summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.global2
-rwxr-xr-xrun-tests.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global
index b58ccc34c4..85189fe3fe 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -50,7 +50,7 @@ test: $(SAPI_CLI_PATH)
@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' $(top_srcdir)/run-tests.php $(TESTS)
+ $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'safe_mode=0' -d 'output_buffering=Off' -d 'auto_prepend_file=' -d 'auto_append_file=' -d 'output_handler=' -d 'register_argv=1' -d 'disable_functions=' $(top_srcdir)/run-tests.php $(TESTS)
clean:
find . -name \*.lo -o -name \*.o | xargs rm -f
diff --git a/run-tests.php b/run-tests.php
index efdeb8f54b..036edfd6da 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -44,8 +44,9 @@ if (getenv('TEST_PHP_SRCDIR')) {
$cwd = getcwd();
set_time_limit(0);
-ob_implicit_flush();
error_reporting(E_ALL);
+ini_set('magic_quotes_runtime', 0);
+ini_set('memory_limit', '8M');
if (ini_get('safe_mode')) {
echo <<< SAFE_MODE_WARNING