Skip to content

Commit 4e12189

Browse files
committed
Mark some phar tests as flaky on macOS
Fixes GH-15748 Closes GH-15876
1 parent fecad54 commit 4e12189

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
@@ -2159,6 +2159,9 @@ function run_test(string $php, $file, array $env): string
21592159
} elseif (!strncasecmp('xfail', $output, 5)) {
21602160
// Pretend we have an XFAIL section
21612161
$test->setSection('XFAIL', ltrim(substr($output, 5)));
2162+
} elseif (!strncasecmp('flaky', $output, 5)) {
2163+
// Pretend we have a FLAKY section
2164+
$test->setSection('FLAKY', ltrim(substr($output, 5)));
21622165
} elseif ($output !== '') {
21632166
show_result("BORK", $output, $tested_file, 'reason: invalid output from SKIPIF', $temp_filenames);
21642167
$PHP_FAILED_TESTS['BORKED'][] = [

0 commit comments

Comments
 (0)