From 5cac49ebb561e0728875670ab60cc1d3a3537a3d Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Tue, 22 Aug 2023 13:38:05 +0100
Subject: [PATCH 1/4] [skip ci] Skip test with ASAN due to LSAN bug on Clang 14

Change formatting of output to not have trailing whitespaces
---
 sapi/cli/tests/ext_loading.phpt | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/sapi/cli/tests/ext_loading.phpt b/sapi/cli/tests/ext_loading.phpt
index 220302da629d..010043f596d7 100644
--- a/sapi/cli/tests/ext_loading.phpt
+++ b/sapi/cli/tests/ext_loading.phpt
@@ -2,6 +2,9 @@
 Extension loading
 --SKIPIF--
 <?php
+if (getenv('SKIP_ASAN')) {
+    die('xfail LSAN bug on Clang 14 crashes this test');
+}
 $extDir = ini_get('extension_dir');
 if (!file_exists($extDir . '/opcache.so') && !file_exists($extDir . '/php_opcache.dll')) {
     die('skip Opcache shared object not found in extension_dir');
@@ -10,7 +13,6 @@ if (!file_exists($extDir . '/opcache.so') && !file_exists($extDir . '/php_opcach
 --FILE--
 <?php
 
-
 function loadZendExt($extension) {
     $cmd = [
         PHP_BINARY, '-n',
@@ -19,7 +21,7 @@ function loadZendExt($extension) {
         '-r', 'echo "Done.";'
     ];
     $proc = proc_open($cmd, [['null'], ['pipe', 'w'], ['redirect', 1]], $pipes);
-    echo "Output: ", stream_get_contents($pipes[1]), "\n";
+    echo "Output: '", stream_get_contents($pipes[1]), "'\n";
 }
 
 echo "Only extension name:\n";
@@ -47,19 +49,19 @@ loadZendExt($path);
 ?>
 --EXPECTF--
 Only extension name:
-Output: Done.
+Output: 'Done.'
 Name with file extension:
-Output: Done.
+Output: 'Done.'
 Absolute path:
-Output: Done.
+Output: 'Done.'
 Unknown extension name (unknown):
-Output: 
+Output: ''
 Warning: Failed loading Zend extension 'unknown_ext' (tried: %s) in Unknown on line 0
 Done.
 Name with file extension (unknown):
-Output: 
+Output: ''
 Warning: Failed loading Zend extension '%Sunknown_ext%S' (tried: %s) in Unknown on line 0
 Done.
 Absolute path (unknown):
-Output: Failed loading %s
+Output: 'Failed loading %s'
 Done.

From 054d60f2cd7b95e9e619dffb3b6e8c9d26fd59cd Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Tue, 22 Aug 2023 13:53:44 +0100
Subject: [PATCH 2/4] xleak

---
 sapi/cli/tests/ext_loading.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sapi/cli/tests/ext_loading.phpt b/sapi/cli/tests/ext_loading.phpt
index 010043f596d7..0c7ba96a9ddc 100644
--- a/sapi/cli/tests/ext_loading.phpt
+++ b/sapi/cli/tests/ext_loading.phpt
@@ -3,7 +3,7 @@ Extension loading
 --SKIPIF--
 <?php
 if (getenv('SKIP_ASAN')) {
-    die('xfail LSAN bug on Clang 14 crashes this test');
+    die('xleak LSAN bug on Clang 14 crashes this test');
 }
 $extDir = ini_get('extension_dir');
 if (!file_exists($extDir . '/opcache.so') && !file_exists($extDir . '/php_opcache.dll')) {

From 984de943c0508e1d04ba37e730197025432667f0 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Tue, 22 Aug 2023 14:41:15 +0100
Subject: [PATCH 3/4] Change output

---
 sapi/cli/tests/ext_loading.phpt | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/sapi/cli/tests/ext_loading.phpt b/sapi/cli/tests/ext_loading.phpt
index 0c7ba96a9ddc..6875da459fe1 100644
--- a/sapi/cli/tests/ext_loading.phpt
+++ b/sapi/cli/tests/ext_loading.phpt
@@ -21,7 +21,7 @@ function loadZendExt($extension) {
         '-r', 'echo "Done.";'
     ];
     $proc = proc_open($cmd, [['null'], ['pipe', 'w'], ['redirect', 1]], $pipes);
-    echo "Output: '", stream_get_contents($pipes[1]), "'\n";
+    echo "#####OUTPUT_BEGIN####\n", stream_get_contents($pipes[1]), "\n######OUTPUT_END#####\n";
 }
 
 echo "Only extension name:\n";
@@ -49,19 +49,30 @@ loadZendExt($path);
 ?>
 --EXPECTF--
 Only extension name:
-Output: 'Done.'
+#####OUTPUT_BEGIN####
+Done.
+######OUTPUT_END#####
 Name with file extension:
-Output: 'Done.'
+#####OUTPUT_BEGIN####
+Done.
+######OUTPUT_END#####
 Absolute path:
-Output: 'Done.'
+#####OUTPUT_BEGIN####
+Done.
+######OUTPUT_END#####
 Unknown extension name (unknown):
-Output: ''
+#####OUTPUT_BEGIN####
 Warning: Failed loading Zend extension 'unknown_ext' (tried: %s) in Unknown on line 0
 Done.
+######OUTPUT_END#####
 Name with file extension (unknown):
-Output: ''
+#####OUTPUT_BEGIN####
+
 Warning: Failed loading Zend extension '%Sunknown_ext%S' (tried: %s) in Unknown on line 0
 Done.
+######OUTPUT_END#####
 Absolute path (unknown):
-Output: 'Failed loading %s'
+#####OUTPUT_BEGIN####
+Failed loading %s
 Done.
+######OUTPUT_END#####

From b8c9d607b49712a9b3b4b4c721362843db481df7 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Tue, 22 Aug 2023 16:06:47 +0100
Subject: [PATCH 4/4] Whitespace

---
 sapi/cli/tests/ext_loading.phpt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sapi/cli/tests/ext_loading.phpt b/sapi/cli/tests/ext_loading.phpt
index 6875da459fe1..f262b3e2ac3f 100644
--- a/sapi/cli/tests/ext_loading.phpt
+++ b/sapi/cli/tests/ext_loading.phpt
@@ -62,6 +62,7 @@ Done.
 ######OUTPUT_END#####
 Unknown extension name (unknown):
 #####OUTPUT_BEGIN####
+
 Warning: Failed loading Zend extension 'unknown_ext' (tried: %s) in Unknown on line 0
 Done.
 ######OUTPUT_END#####