From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 20 Dec 2019 12:52:08 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca6c54274cb039f4a86f02c421a91c2cfa8f73b4;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Try to make proc_open_bug69900.phpt more robust
---

ca6c54274cb039f4a86f02c421a91c2cfa8f73b4
diff --cc ext/standard/tests/streams/proc_open_bug69900.phpt
index 0eb9e45054,61775f72b2..eacd86c0a9
--- a/ext/standard/tests/streams/proc_open_bug69900.phpt
+++ b/ext/standard/tests/streams/proc_open_bug69900.phpt
@@@ -48,7 -47,14 +47,13 @@@ fclose($pipes[1])
  
  proc_close($process);
  
+ /* It is expected that the first call takes more than the limit.
+  * Allow one more to account for a possible process switch. */
+ if ($moreThanLimit > 2) {
+     echo "fgets() took more than $max_ms ms $moreThanLimit times\n";
+ }
+ 
  ?>
 -===DONE===
  --CLEAN--
  <?php
  $fl = __DIR__ . DIRECTORY_SEPARATOR . "test69900.php";