archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

6
ext/phar/tests/033a.phpt
View file

@ -5,6 +5,12 @@ phar
--INI-- --INI--
phar.readonly=1 phar.readonly=1
phar.require_hash=0 phar.require_hash=0
--SKIPIF--
<?php
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
die("flaky Occasionally segfaults on macOS for unknown reasons");
}
?>
--FILE-- --FILE--
<?php <?php
$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php'; $fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php';

6
ext/phar/tests/phar_oo_002.phpt
View file

@ -5,6 +5,12 @@ phar
--INI-- --INI--
phar.readonly=1 phar.readonly=1
phar.require_hash=0 phar.require_hash=0
--SKIPIF--
<?php
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
die("flaky Occasionally segfaults on macOS for unknown reasons");
}
?>
--FILE-- --FILE--
<?php <?php

6
ext/phar/tests/stat.phpt
View file

@ -5,6 +5,12 @@ phar
--INI-- --INI--
phar.require_hash=1 phar.require_hash=1
phar.readonly=0 phar.readonly=0
--SKIPIF--
<?php
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
die("flaky Occasionally segfaults on macOS for unknown reasons");
}
?>
--FILE-- --FILE--
<?php <?php
umask(0); umask(0);

6
ext/phar/tests/tar/033a.phpt
View file

@ -5,6 +5,12 @@ phar
--INI-- --INI--
phar.readonly=0 phar.readonly=0
phar.require_hash=0 phar.require_hash=0
--SKIPIF--
<?php
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
die("flaky Occasionally segfaults on macOS for unknown reasons");
}
?>
--FILE-- --FILE--
<?php <?php

6
ext/phar/tests/zip/033a.phpt
View file

@ -5,6 +5,12 @@ phar
--INI-- --INI--
phar.readonly=0 phar.readonly=0
phar.require_hash=0 phar.require_hash=0
--SKIPIF--
<?php
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
die("flaky Occasionally segfaults on macOS for unknown reasons");
}
?>
--FILE-- --FILE--
<?php <?php

3
run-tests.php
View file

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