From: Joe Watkins <krakjoe@php.net>
Date: Wed, 5 Jun 2019 14:35:43 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.3.7RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=249c20023d4446d81a2904dc5e8d3aa4a3a2d016;p=php

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  fix flaky posix test
---

249c20023d4446d81a2904dc5e8d3aa4a3a2d016
diff --cc ext/posix/tests/posix_errno_variation2.phpt
index ff44b70cb6,52d076cc63..6335fa5327
--- a/ext/posix/tests/posix_errno_variation2.phpt
+++ b/ext/posix/tests/posix_errno_variation2.phpt
@@@ -10,21 -10,12 +10,12 @@@ Francesco Fullone ff@ideato.i
  ?>
  --FILE--
  <?php
- 
  echo "*** Test by calling function with pid error ***\n";
  
- $pid = 10000;
- 
- do {
-   $pid += 1;
-   $result = shell_exec("ps -p " . $pid);
- } while (strstr($pid, $result));
+ posix_kill((2 ** 22) + 1, SIGKILL);
  
- posix_kill($pid, SIGKILL);
  var_dump(posix_errno());
- 
  ?>
 ---EXPECTF--
 +--EXPECT--
  *** Test by calling function with pid error ***
  int(3)