From 1535b8deb2583a44af1478829e8a3008adf62069 Mon Sep 17 00:00:00 2001
From: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Fri, 20 May 2022 14:58:42 +0200
Subject: [PATCH] Reduce the scope of XFAIL

---
 ext/opcache/tests/bug78175_2.phpt                 | 3 +--
 ext/opcache/tests/bug78376.phpt                   | 3 +--
 ext/opcache/tests/preload_method_static_vars.phpt | 3 +--
 ext/opcache/tests/preload_trait_static.phpt       | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ext/opcache/tests/bug78175_2.phpt b/ext/opcache/tests/bug78175_2.phpt
index 37c025057d93..728a5c8fe1e2 100644
--- a/ext/opcache/tests/bug78175_2.phpt
+++ b/ext/opcache/tests/bug78175_2.phpt
@@ -9,9 +9,8 @@ opcache.preload={PWD}/preload_bug78175_2.inc
 <?php
 require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_ZTS) die('xfail GH-8588');
 ?>
---XFAIL--
-GH-8588
 --FILE--
 <?php
 var_dump(get_class(Loader::getLoader()));
diff --git a/ext/opcache/tests/bug78376.phpt b/ext/opcache/tests/bug78376.phpt
index b71b4ea3eeac..f3d5ce2db98f 100644
--- a/ext/opcache/tests/bug78376.phpt
+++ b/ext/opcache/tests/bug78376.phpt
@@ -9,9 +9,8 @@ opcache.preload={PWD}/preload_bug78376.inc
 <?php
 require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_ZTS) die('xfail GH-8588');
 ?>
---XFAIL--
-GH-8588
 --FILE--
 <?php
 var_dump(\A::$a);
diff --git a/ext/opcache/tests/preload_method_static_vars.phpt b/ext/opcache/tests/preload_method_static_vars.phpt
index b531f9213b0b..e493bf5ad96d 100644
--- a/ext/opcache/tests/preload_method_static_vars.phpt
+++ b/ext/opcache/tests/preload_method_static_vars.phpt
@@ -9,9 +9,8 @@ opcache.preload={PWD}/preload_method_static_vars.inc
 <?php
 require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_ZTS) die('xfail GH-8588');
 ?>
---XFAIL--
-GH-8588
 --FILE--
 <?php
 Foo::test();
diff --git a/ext/opcache/tests/preload_trait_static.phpt b/ext/opcache/tests/preload_trait_static.phpt
index b69e3314239f..bfc3d08138b3 100644
--- a/ext/opcache/tests/preload_trait_static.phpt
+++ b/ext/opcache/tests/preload_trait_static.phpt
@@ -9,9 +9,8 @@ opcache.preload={PWD}/preload_trait_static.inc
 <?php
 require_once('skipif.inc');
 if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_ZTS) die('xfail GH-8588');
 ?>
---XFAIL--
-GH-8588
 --FILE--
 <?php
 $bar = new Bar;