From 4e12189604d76396f8c3b9d5dda6e8757f1d8618 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] Mark some phar tests as flaky on macOS

Fixes GH-15748
Closes GH-15876
---
 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, 33 insertions(+)

diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt
index c36c5c68539..355617b29f9 100644
--- a/ext/phar/tests/033a.phpt
+++ b/ext/phar/tests/033a.phpt
@@ -5,6 +5,12 @@ phar
 --INI--
 phar.readonly=1
 phar.require_hash=0
+--SKIPIF--
+<?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 71e0e78a03f..e1a959c4e5f 100644
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -5,6 +5,12 @@ phar
 --INI--
 phar.readonly=1
 phar.require_hash=0
+--SKIPIF--
+<?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 54bf7581d85..09355a53c25 100644
--- a/ext/phar/tests/stat.phpt
+++ b/ext/phar/tests/stat.phpt
@@ -5,6 +5,12 @@ phar
 --INI--
 phar.require_hash=1
 phar.readonly=0
+--SKIPIF--
+<?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 3a4d396fcb5..f0f3faf58e0 100644
--- a/ext/phar/tests/tar/033a.phpt
+++ b/ext/phar/tests/tar/033a.phpt
@@ -5,6 +5,12 @@ phar
 --INI--
 phar.readonly=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--
 <?php
 
diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt
index dc072279d83..b11ea44ed32 100644
--- a/ext/phar/tests/zip/033a.phpt
+++ b/ext/phar/tests/zip/033a.phpt
@@ -5,6 +5,12 @@ phar
 --INI--
 phar.readonly=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--
 <?php
 
diff --git a/run-tests.php b/run-tests.php
index bb422e41c0f..5add428aadd 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2159,6 +2159,9 @@ TEST $file
         } 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'][] = [