mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Mark some phar tests as flaky on macOS
This commit is contained in:
@@ -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';
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -2218,6 +2218,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', $temp_filenames);
|
||||
$PHP_FAILED_TESTS['BORKED'][] = [
|
||||
|
||||
Reference in New Issue
Block a user