From a2b4fa15255254291607f86a244ff5f1993e3363 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Fri, 13 Sep 2024 15:29:21 +0200
Subject: [PATCH 1/2] Mark flaky phar tests as xfail on macOS

Fixes GH-15748
---
 ext/phar/tests/033a.phpt        | 2 ++
 ext/phar/tests/phar_oo_002.phpt | 2 ++
 ext/phar/tests/stat.phpt        | 2 ++
 ext/phar/tests/tar/033a.phpt    | 2 ++
 ext/phar/tests/zip/033a.phpt    | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt
index c36c5c6853985..9fb3f57bdd12b 100644
--- a/ext/phar/tests/033a.phpt
+++ b/ext/phar/tests/033a.phpt
@@ -5,6 +5,8 @@ phar
 --INI--
 phar.readonly=1
 phar.require_hash=0
+--SKIPIF--
+<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
 --FILE--
 <?php
 $fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php';
diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 71e0e78a03f53..6e43f21690d0d 100644
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -5,6 +5,8 @@ phar
 --INI--
 phar.readonly=1
 phar.require_hash=0
+--SKIPIF--
+<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt
index 54bf7581d852d..dafe4badf0e6f 100644
--- a/ext/phar/tests/stat.phpt
+++ b/ext/phar/tests/stat.phpt
@@ -5,6 +5,8 @@ phar
 --INI--
 phar.require_hash=1
 phar.readonly=0
+--SKIPIF--
+<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
 --FILE--
 <?php
 umask(0);
diff --git a/ext/phar/tests/tar/033a.phpt b/ext/phar/tests/tar/033a.phpt
index 3a4d396fcb53b..c7b643081be3f 100644
--- a/ext/phar/tests/tar/033a.phpt
+++ b/ext/phar/tests/tar/033a.phpt
@@ -5,6 +5,8 @@ phar
 --INI--
 phar.readonly=0
 phar.require_hash=0
+--SKIPIF--
+<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt
index dc072279d831e..406756022928f 100644
--- a/ext/phar/tests/zip/033a.phpt
+++ b/ext/phar/tests/zip/033a.phpt
@@ -5,6 +5,8 @@ phar
 --INI--
 phar.readonly=0
 phar.require_hash=0
+--SKIPIF--
+<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
 --FILE--
 <?php
 

From a3c3f8130d5f64887c5a1f0e398678195ebccb3a Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Fri, 13 Sep 2024 16:14:44 +0200
Subject: [PATCH 2/2] Use conditional FLAKY instead, and restrict to GA

---
 ext/phar/tests/033a.phpt        | 6 +++++-
 ext/phar/tests/phar_oo_002.phpt | 6 +++++-
 ext/phar/tests/stat.phpt        | 6 +++++-
 ext/phar/tests/tar/033a.phpt    | 6 +++++-
 ext/phar/tests/zip/033a.phpt    | 6 +++++-
 run-tests.php                   | 3 +++
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt
index 9fb3f57bdd12b..355617b29f93f 100644
--- a/ext/phar/tests/033a.phpt
+++ b/ext/phar/tests/033a.phpt
@@ -6,7 +6,11 @@ phar
 phar.readonly=1
 phar.require_hash=0
 --SKIPIF--
-<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
+<?php
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
+    die("flaky Occasionally segfaults on macOS for unknown reasons");
+}
+?>
 --FILE--
 <?php
 $fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php';
diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 6e43f21690d0d..e1a959c4e5f17 100644
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -6,7 +6,11 @@ phar
 phar.readonly=1
 phar.require_hash=0
 --SKIPIF--
-<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
+<?php
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
+    die("flaky Occasionally segfaults on macOS for unknown reasons");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt
index dafe4badf0e6f..09355a53c257c 100644
--- a/ext/phar/tests/stat.phpt
+++ b/ext/phar/tests/stat.phpt
@@ -6,7 +6,11 @@ phar
 phar.require_hash=1
 phar.readonly=0
 --SKIPIF--
-<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
+<?php
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
+    die("flaky Occasionally segfaults on macOS for unknown reasons");
+}
+?>
 --FILE--
 <?php
 umask(0);
diff --git a/ext/phar/tests/tar/033a.phpt b/ext/phar/tests/tar/033a.phpt
index c7b643081be3f..f0f3faf58e094 100644
--- a/ext/phar/tests/tar/033a.phpt
+++ b/ext/phar/tests/tar/033a.phpt
@@ -6,7 +6,11 @@ phar
 phar.readonly=0
 phar.require_hash=0
 --SKIPIF--
-<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
+<?php
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
+    die("flaky Occasionally segfaults on macOS for unknown reasons");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt
index 406756022928f..b11ea44ed32fd 100644
--- a/ext/phar/tests/zip/033a.phpt
+++ b/ext/phar/tests/zip/033a.phpt
@@ -6,7 +6,11 @@ phar
 phar.readonly=0
 phar.require_hash=0
 --SKIPIF--
-<?php if (PHP_OS_FAMILY === "Darwin") die("xfail Flaky on macOS for unknown reasons"); ?>
+<?php
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
+    die("flaky Occasionally segfaults on macOS for unknown reasons");
+}
+?>
 --FILE--
 <?php
 
diff --git a/run-tests.php b/run-tests.php
index bb422e41c0fe4..5add428aaddc5 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2159,6 +2159,9 @@ function run_test(string $php, $file, array $env): string
         } elseif (!strncasecmp('xfail', $output, 5)) {
             // Pretend we have an XFAIL section
             $test->setSection('XFAIL', 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'][] = [