From 8a9d45b86f89bbaffa6e3f30eb8b75b39c509a1d 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] Backport flaky flag for phar tests

4e12189604d76396f8c3b9d5dda6e8757f1d8618
b6ca871396328befca3f4e65a49a81b47cea1ced
062837aa13a72febf0fb14fd2b8afda338ee3f0a
---
 ext/phar/tests/033a.phpt                   | 6 ++++++
 ext/phar/tests/phar_oo_002.phpt            | 6 ++++++
 ext/phar/tests/phar_oo_iswriteable.phpt    | 6 ++++++
 ext/phar/tests/stat.phpt                   | 6 ++++++
 ext/phar/tests/tar/033a.phpt               | 6 ++++++
 ext/phar/tests/zip/033a.phpt               | 6 ++++++
 ext/posix/tests/posix_getgrnam_basic.phpt  | 5 ++++-
 ext/posix/tests/posix_getgroups_basic.phpt | 6 ++++++
 run-tests.php                              | 3 +++
 9 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt
index c36c5c6853985..355617b29f93f 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 71e0e78a03f53..e1a959c4e5f17 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/phar_oo_iswriteable.phpt b/ext/phar/tests/phar_oo_iswriteable.phpt
index 836feb4ba8d5d..789d17f10acf1 100644
--- a/ext/phar/tests/phar_oo_iswriteable.phpt
+++ b/ext/phar/tests/phar_oo_iswriteable.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
 $fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php';
diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt
index 54bf7581d852d..09355a53c257c 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 3a4d396fcb53b..f0f3faf58e094 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 dc072279d831e..b11ea44ed32fd 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/ext/posix/tests/posix_getgrnam_basic.phpt b/ext/posix/tests/posix_getgrnam_basic.phpt
index acf8f4473e5d8..86e2dd390b430 100644
--- a/ext/posix/tests/posix_getgrnam_basic.phpt
+++ b/ext/posix/tests/posix_getgrnam_basic.phpt
@@ -4,7 +4,10 @@ Test posix_getgrnam() function : basic functionality
 posix
 --SKIPIF--
 <?php
-    if (!posix_getgroups()) die('skip - groups unavailable (ci)');
+if (!posix_getgroups()) die('skip - groups unavailable (ci)');
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
+    die("flaky Occasionally segfaults on macOS for unknown reasons");
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getgroups_basic.phpt b/ext/posix/tests/posix_getgroups_basic.phpt
index 06ca1a96ae259..165e300c47d7a 100644
--- a/ext/posix/tests/posix_getgroups_basic.phpt
+++ b/ext/posix/tests/posix_getgroups_basic.phpt
@@ -2,6 +2,12 @@
 Test posix_getgroups() function : basic functionality
 --EXTENSIONS--
 posix
+--SKIPIF--
+<?php
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
+    die("flaky Occasionally segfaults on macOS for unknown reasons");
+}
+?>
 --FILE--
 <?php
   echo "Basic test of POSIX getgroups\n";
diff --git a/run-tests.php b/run-tests.php
index 39621a39aa666..070229ec1d6aa 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2240,6 +2240,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'][] = [