From c641825c64e42627a2c9cac969b371ed532e0b57 Mon Sep 17 00:00:00 2001
From: Ryan Sundberg <ryan@arctype.co>
Date: Mon, 4 Oct 2021 20:12:25 -0700
Subject: [PATCH] Zend/tests/bug74093.phpt: Fix failing test case

This test case fails (on non-Windows hosts, where it is enabled) due
to mismatching output in the error log language. This fixes the
expectation, and also rewrites the test procedure in a more stable
fashion.

The objective of the test case is to run a program that exceeds
the max_execution_time and verify that the process was aborted. The
previous implementation tested this using a loop on array_intersect with
large enough inputs to "probably" take enough time to trigger
max_execution_time to abort it. With faster CPUs, over time this test
can become flaky. Instead we simply spin a loop until enough
wall clock time has passed to check our assertion.
---
 Zend/tests/bug74093.phpt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Zend/tests/bug74093.phpt b/Zend/tests/bug74093.phpt
index 7f20285805..32eb445ddc 100644
--- a/Zend/tests/bug74093.phpt
+++ b/Zend/tests/bug74093.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
+Bug #74093 (Maximum execution time exceeded not written in error_log)
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
@@ -12,9 +12,9 @@ max_execution_time=1
 hard_timeout=1
 --FILE--
 <?php
-$a1 = range(1, 1000000);
-$a2 = range(100000, 1999999);
-array_intersect($a1, $a2);
+$start = time();
+while (time() - $start < 5);
+die("Failed to interrupt execution");
 ?>
 --EXPECTF--
-Fatal error: Maximum execution time of 1+1 seconds exceeded %s
+Fatal error: Maximum execution time of 1 second exceeded in %s
--
2.31.1
lue='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=643c2fb44b3c60017a4feaf6d3cfffb6efb1e789'>root</a>/<a href='/guix/log/po?id=643c2fb44b3c60017a4feaf6d3cfffb6efb1e789'>po</a>/<a href='/guix/log/po/doc?id=643c2fb44b3c60017a4feaf6d3cfffb6efb1e789'>doc</a>/<a href='/guix/log/po/doc/guix-manual.fa.po?id=643c2fb44b3c60017a4feaf6d3cfffb6efb1e789'>guix-manual.fa.po</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/po/doc/guix-manual.fa.po?id=643c2fb44b3c60017a4feaf6d3cfffb6efb1e789&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-09 11:35:59 +0100'>2022-01-09</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=934b0cdfee2078bad42429427e12d6ee2ddb7fec'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.fi.po: New file.
* po/doc/guix-manual.fi.po: New file.
* po/doc/local.mk: Add them.
* doc/local.mk: Add them.
* po/guix/fi.po: New file.
* po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-12-04 19:40:52 +0100'>2021-12-04</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=7fcb20a8fa242ab53b9bc97ef0b0367c6a399bd4'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-11-06 14:06:36 +0100'>2021-11-06</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=85430a9ea6f32aaae3e34741e292a01a2de62ee0'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.es.po: New file.
* po/doc/local.mk: Add 'es' cookbook.
* doc/local.mk: Add 'es' cookbook.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-10-17 22:10:25 +0200'>2021-10-17</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=15c91189cb61c579f4289047c79530cefe75215f'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-09-02 04:06:52 +0200'>2021-09-02</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=1ff2092a39dc5c7c7cd9b4a0ba4b59f92e738efc'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/it.po: New file.
* po/packages/LINGUAS: Add `it'.
* po/*/*.po: Update translations.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-08-04 14:49:53 +0200'>2021-08-04</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=6c10c96fedf707d7be059aeb79bd5c8e2d2fa210'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.ru.po: New file.
* po/doc/guix-cookbook.sk.po: New file.
* po/*/*.po: Update translations.
* doc/local.mk (COOKBOOK_LANGUAGES): Add ru and sk.
(info_TEXINFOS): Add Russian and Slovak cookbooks.
* po/doc/local.mk (DOC_COOKBOOK_PO_FILES): Add Russian and Slovak po
files.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-05-11 09:17:00 -0400'>2021-05-11</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=a0178d34f582b50e9bdbb0403943129ae5b560ff'>nls: Update translations.</a></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-05-10 22:34:43 -0400'>2021-05-10</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=21fcced608c93e1ac836cdd9ab8c5d200c667e75'>nls: Update translations.</a></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-18 13:18:17 +0200'>2021-04-18</span></td><td><a href='/guix/commit/po/doc/guix-manual.fa.po?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>nls: Add Persian translation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/fa.po: New file.
* po/packages/LINGUAS: Add 'fa'.
* po/doc/guix-cookbook.fa.po: New file.
* po/doc/guix-manual.fa.po: New file.
* po/doc/local.mk (DOC_PO_FILES, DOC_COOKBOOK_PO_FILES): Add them.
* doc/local.mk (info_TEXINFOS): Add them.
</span></span></td><td>Julien Lepiller</td></tr>