From c6caa8cfb0613c3459d4ac517769a459bd878155 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sat, 28 Sep 2024 13:54:01 +0200
Subject: [PATCH] Skip tests requiring to load dl_test dynamically

We have a couple of test cases which are useless, if the dl_test
extension is already loaded, since they test the behavior of `dl()`.
However, they are currently failing if dl_test is already loaded; we
skip these tests now instead.
---
 ext/opcache/tests/gh8466.phpt                          | 10 +++++-----
 ext/standard/tests/general_functions/dl-001.phpt       |  8 +++-----
 ext/standard/tests/general_functions/dl-002.phpt       |  7 +++----
 ext/standard/tests/general_functions/dl-003.phpt       |  7 +++----
 .../dl-use_register_functions_directly.phpt            | 10 +++++-----
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/ext/opcache/tests/gh8466.phpt b/ext/opcache/tests/gh8466.phpt
index a89739f64512d..65bcd0faefff2 100644
--- a/ext/opcache/tests/gh8466.phpt
+++ b/ext/opcache/tests/gh8466.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug GH-8466: ini_get() is optimized out when the option does not exist during compilation
 --SKIPIF--
-<?php include dirname(__DIR__, 2) . "/dl_test/tests/skip.inc"; ?>
---FILE--
 <?php
-
+include dirname(__DIR__, 2) . "/dl_test/tests/skip.inc";
 if (extension_loaded('dl_test')) {
-    exit('Error: dl_test is already loaded');
+    die('skip dl_test is already loaded');
 }
-
+?>
+--FILE--
+<?php
 if (PHP_OS_FAMILY === 'Windows') {
     $loaded = dl('php_dl_test.dll');
 } else {
diff --git a/ext/standard/tests/general_functions/dl-001.phpt b/ext/standard/tests/general_functions/dl-001.phpt
index f03c531e55592..f778c77c8f0b1 100644
--- a/ext/standard/tests/general_functions/dl-001.phpt
+++ b/ext/standard/tests/general_functions/dl-001.phpt
@@ -3,15 +3,13 @@ dl(): Loaded extensions properly unregister their ini settings
 --SKIPIF--
 <?php
 include dirname(__DIR__, 3) . "/dl_test/tests/skip.inc";
+if (extension_loaded('dl_test')) {
+    die('skip dl_test is already loaded');
+}
 if (getenv('SKIP_ASAN')) die('skip fails intermittently on ASAN');
 ?>
 --FILE--
 <?php
-
-if (extension_loaded('dl_test')) {
-    exit('Error: dl_test is already loaded');
-}
-
 if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
     $loaded = dl('php_dl_test.dll');
 } else {
diff --git a/ext/standard/tests/general_functions/dl-002.phpt b/ext/standard/tests/general_functions/dl-002.phpt
index 5e8fea5ebeaa9..9c8680192b36f 100644
--- a/ext/standard/tests/general_functions/dl-002.phpt
+++ b/ext/standard/tests/general_functions/dl-002.phpt
@@ -5,14 +5,13 @@ PHP_DL_TEST_USE_OLD_REGISTER_INI_ENTRIES=1
 --SKIPIF--
 <?php
 include dirname(__DIR__, 3) . "/dl_test/tests/skip.inc";
+if (extension_loaded('dl_test')) {
+    die('skip dl_test is already loaded');
+}
 if (getenv('SKIP_ASAN')) die('skip fails intermittently on ASAN');
 ?>
 --FILE--
 <?php
-
-if (extension_loaded('dl_test')) {
-    exit('Error: dl_test is already loaded');
-}
 if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
     $loaded = dl('php_dl_test.dll');
 } else {
diff --git a/ext/standard/tests/general_functions/dl-003.phpt b/ext/standard/tests/general_functions/dl-003.phpt
index 3b7da98d4b0db..3a9add0696c75 100644
--- a/ext/standard/tests/general_functions/dl-003.phpt
+++ b/ext/standard/tests/general_functions/dl-003.phpt
@@ -3,14 +3,13 @@ dl(): Loaded extensions support ini_set()
 --SKIPIF--
 <?php
 include dirname(__DIR__, 3) . "/dl_test/tests/skip.inc";
+if (extension_loaded('dl_test')) {
+    die('skip dl_test is already loaded');
+}
 if (getenv('SKIP_ASAN')) die('skip fails intermittently on ASAN');
 ?>
 --FILE--
 <?php
-
-if (extension_loaded('dl_test')) {
-    exit('Error: dl_test is already loaded');
-}
 if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
     $loaded = dl('php_dl_test.dll');
 } else {
diff --git a/ext/standard/tests/general_functions/dl-use_register_functions_directly.phpt b/ext/standard/tests/general_functions/dl-use_register_functions_directly.phpt
index e76f927eecfbd..53524c53f3580 100644
--- a/ext/standard/tests/general_functions/dl-use_register_functions_directly.phpt
+++ b/ext/standard/tests/general_functions/dl-use_register_functions_directly.phpt
@@ -3,14 +3,14 @@ dl(): use zend_register_functions() directly
 --ENV--
 PHP_DL_TEST_USE_REGISTER_FUNCTIONS_DIRECTLY=1
 --SKIPIF--
-<?php require dirname(__DIR__, 3) . "/dl_test/tests/skip.inc"; ?>
---FILE--
 <?php
-
+require dirname(__DIR__, 3) . "/dl_test/tests/skip.inc";
 if (extension_loaded('dl_test')) {
-    exit('Error: dl_test is already loaded');
+    die('skip dl_test is already loaded');
 }
-
+?>
+--FILE--
+<?php
 if (PHP_OS_FAMILY === 'Windows') {
     $loaded = dl('php_dl_test.dll');
 } else {