1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3'

* PHP-8.3:
  Mark some phar tests as flaky on macOS
This commit is contained in:
Ilija Tovilo
2024-09-13 18:14:23 +02:00
6 changed files with 33 additions and 0 deletions

View File

@@ -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';

View File

@@ -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

View File

@@ -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);

View File

@@ -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

View File

@@ -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

View File

@@ -2177,6 +2177,9 @@ TEST $file
} elseif (!strncasecmp('xleak', $output, 5)) {
// Pretend we have an XLEAK section
$test->setSection('XLEAK', 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');
$PHP_FAILED_TESTS['BORKED'][] = [