Skip to content

Commit abcf0c4

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: [skip ci] Skip suspicious fpm tests on GH actions & macOS
2 parents 72a18f8 + 00bec81 commit abcf0c4

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

sapi/fpm/tests/bug74083-concurrent-reload.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Concurrent reload signals should not kill PHP-FPM master process. (Bug: #74083)
44
<?php
55
include "skipif.inc";
66
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
7+
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") die("flaky Potential cause for GitHub Actions crash");
78
?>
89
--FILE--
910
<?php

sapi/fpm/tests/bug76601-reload-child-signals.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ FPM: bug76601 children should not ignore signals during concurrent reloads
44
<?php
55
include "skipif.inc";
66
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
7+
if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") die("flaky Potential cause for GitHub Actions crash");
78
?>
89
--FILE--
910
<?php

0 commit comments

Comments
 (0)