diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-02-25 12:03:43 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-02-25 12:03:43 +0100 |
| commit | fb683030bf770a946c53c4d622a9d830c2fa2ad6 (patch) | |
| tree | e571bc2b477424211d0f7743319571ed1222eee6 /run-tests.php | |
| parent | ddea5c08167e28e04c92d2fd92e1b52fec5ac01a (diff) | |
| parent | a480bf80933e4d6a8c91a5992b4e5d73da625e17 (diff) | |
| download | php-git-fb683030bf770a946c53c4d622a9d830c2fa2ad6.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Capture Microsoft-defined HRESULT exit codes exit codes
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php index 34fc65e6c5..c5f1c02ad6 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1294,6 +1294,9 @@ function system_with_timeout( } if ($stat["exitcode"] > 128 && $stat["exitcode"] < 160) { $data .= "\nTermsig=" . ($stat["exitcode"] - 128) . "\n"; + } else if (defined('PHP_WINDOWS_VERSION_MAJOR') && (($stat["exitcode"] >> 28) & 0b1111) === 0b1100) { + // https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/87fba13e-bf06-450e-83b1-9241dc81e781 + $data .= "\nTermsig=" . $stat["exitcode"] . "\n"; } proc_close($proc); |