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
f1a8'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='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=30c3ab3807dc62d9e43b358f2890a19c7ba9f1a8&amp;showmsg=1'>root</a>/<a href='/guix/log/build-aux?id=30c3ab3807dc62d9e43b358f2890a19c7ba9f1a8&amp;showmsg=1'>build-aux</a>/<a href='/guix/log/build-aux/update-NEWS.scm?id=30c3ab3807dc62d9e43b358f2890a19c7ba9f1a8&amp;showmsg=1'>update-NEWS.scm</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/build-aux/update-NEWS.scm?id=30c3ab3807dc62d9e43b358f2890a19c7ba9f1a8'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-05-10 13:48:02 -0400'>2021-05-10</span></td><td class='logsubject'><a href='/guix/commit/build-aux/update-NEWS.scm?id=ed2d4d52dde00bdccc1bb2c93b24ffcc72a7fcd3'>maint: update-NEWS: Sort packages prior writing to the data file.</a></td><td>Maxim Cournoyer</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* build-aux/update-NEWS.scm (main): Sort packages.


</td></tr>
<tr class='logheader'><td><span title='2021-04-23 21:32:46 -0400'>2021-04-23</span></td><td class='logsubject'><a href='/guix/commit/build-aux/update-NEWS.scm?id=18dc8c6f0f76b8d128638105eebad2895f9857f0'>build-aux: Relax the regexp used to match NEWS sections.</a></td><td>Maxim Cournoyer</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
A number of packages doesn't really make sense in the name of the section to
be substituted.  This change allows using simply '*** new packages' instead of
'*** 1999 new packages', for example, and have the update-NEWS.scm script
update it.

* build-aux/update-NEWS.scm (write-packages-added) &lt;regexp&gt;: Do not care about
leading white space in the name of the section.


</td></tr>