Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Mark some phar tests as flaky on macOS
This commit is contained in:
Ilija Tovilo 2024-09-13 18:14:14 +02:00
commit 5b2d80bc79
No known key found for this signature in database
GPG key ID: 5050C66BFCD1015A
6 changed files with 33 additions and 0 deletions

View file

@ -2218,6 +2218,9 @@ TEST $file
} elseif (!strncasecmp('xleak', $output, 5)) {
// Pretend we have an XLEAK section
$test->setSection('XLEAK', ltrim(substr($output, 5)));
} elseif (!strncasecmp('flaky', $output, 5)) {
// Pretend we have a FLAKY section
$test->setSection('FLAKY', ltrim(substr($output, 5)));
} elseif ($output !== '') {
show_result("BORK", $output, $tested_file, 'reason: invalid output from SKIPIF', $temp_filenames);
$PHP_FAILED_TESTS['BORKED'][] = [