summaryrefslogtreecommitdiff
path: root/tests/output
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-18 23:39:39 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-18 23:39:39 +0200
commit93427292f6df9da7d6a9b567e092d5d73d8b19e4 (patch)
tree899d4228c3f8f0fc94afef6c791b0fe1e0fdb15e /tests/output
parentbca89bb735b4075d48f5794a2cecfede134ed17e (diff)
parentde9f325c12d631d0fcbb90d0e5cf34235d9d6073 (diff)
downloadphp-git-93427292f6df9da7d6a9b567e092d5d73d8b19e4.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Fix tests/output/bug74815.phpt generating errors.log
Diffstat (limited to 'tests/output')
-rw-r--r--tests/output/bug74815.phpt6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/output/bug74815.phpt b/tests/output/bug74815.phpt
index be4fa1b2cb..1d9c825999 100644
--- a/tests/output/bug74815.phpt
+++ b/tests/output/bug74815.phpt
@@ -5,10 +5,14 @@ Bug #74815 crash with a combination of INI entries at startup
$php = getenv("TEST_PHP_EXECUTABLE");
-echo shell_exec("$php -n -d error_log=errors.log -d error_reporting=E_ALL -d log_errors=On -d track_errors=On -v");
+echo shell_exec("$php -n -d error_log=".__DIR__."/error_log.tmp -d error_reporting=E_ALL -d log_errors=On -d track_errors=On -v");
?>
==DONE==
+--CLEAN--
+<?php
+unlink(__DIR__.'/error_log.tmp');
+?>
--EXPECTF--
Deprecated: Directive 'track_errors' is deprecated in Unknown on line 0
%A