Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: [skip ci] Mark some more macOS tests as flaky
php · Oct 13, 2024 · 5c8f42f · 5c8f42f
2 parents 6ff4a2d + b6ca871
commit 5c8f42f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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";