Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5b2d80b

Browse files
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Mark some phar tests as flaky on macOS
2 parents 9185255 + 4e12189 commit 5b2d80b

File tree

6 files changed

+33
-0
lines changed

6 files changed

+33
-0
lines changed

‎ext/phar/tests/033a.phpt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ phar
55
--INI--
66
phar.readonly=1
77
phar.require_hash=0
8+
--SKIPIF--
9+
<?php
10+
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
11+
die("flaky Occasionally segfaults on macOS for unknown reasons");
12+
}
13+
?>
814
--FILE--
915
<?php
1016
$fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php';

‎ext/phar/tests/phar_oo_002.phpt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ phar
55
--INI--
66
phar.readonly=1
77
phar.require_hash=0
8+
--SKIPIF--
9+
<?php
10+
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
11+
die("flaky Occasionally segfaults on macOS for unknown reasons");
12+
}
13+
?>
814
--FILE--
915
<?php
1016

‎ext/phar/tests/stat.phpt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ phar
55
--INI--
66
phar.require_hash=1
77
phar.readonly=0
8+
--SKIPIF--
9+
<?php
10+
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
11+
die("flaky Occasionally segfaults on macOS for unknown reasons");
12+
}
13+
?>
814
--FILE--
915
<?php
1016
umask(0);

‎ext/phar/tests/tar/033a.phpt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ phar
55
--INI--
66
phar.readonly=0
77
phar.require_hash=0
8+
--SKIPIF--
9+
<?php
10+
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
11+
die("flaky Occasionally segfaults on macOS for unknown reasons");
12+
}
13+
?>
814
--FILE--
915
<?php
1016

‎ext/phar/tests/zip/033a.phpt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ phar
55
--INI--
66
phar.readonly=0
77
phar.require_hash=0
8+
--SKIPIF--
9+
<?php
10+
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
11+
die("flaky Occasionally segfaults on macOS for unknown reasons");
12+
}
13+
?>
814
--FILE--
915
<?php
1016

‎run-tests.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,6 +2218,9 @@ function run_test(string $php, $file, array $env): string
22182218
} elseif (!strncasecmp('xleak', $output, 5)) {
22192219
// Pretend we have an XLEAK section
22202220
$test->setSection('XLEAK', ltrim(substr($output, 5)));
2221+
} elseif (!strncasecmp('flaky', $output, 5)) {
2222+
// Pretend we have a FLAKY section
2223+
$test->setSection('FLAKY', ltrim(substr($output, 5)));
22212224
} elseif ($output !== '') {
22222225
show_result("BORK", $output, $tested_file, 'reason: invalid output from SKIPIF', $temp_filenames);
22232226
$PHP_FAILED_TESTS['BORKED'][] = [

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /