From 432d3e98d337197a89ac94a6865538db3bcef8f4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 15 Aug 2024 07:50:39 +0200
Subject: test build for PR

open https://github.com/php/php-src/pull/15420 fix test settings
---
 15420.patch | 22 ++++++++++++++++++++++
 failed.txt  | 20 +++++++++-----------
 php.spec    |  8 +++++++-
 3 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 15420.patch

diff --git a/15420.patch b/15420.patch
new file mode 100644
index 0000000..9d2315b
--- /dev/null
+++ b/15420.patch
@@ -0,0 +1,22 @@
+From 2bb7a54fcecb49f34301fbe016d5bedb54d23963 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 15 Aug 2024 07:31:32 +0200
+Subject: [PATCH] ensure default settings used in test
+
+---
+ Zend/tests/exit/exit_values.phpt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Zend/tests/exit/exit_values.phpt b/Zend/tests/exit/exit_values.phpt
+index e081193b94cd..7b774a961c7e 100644
+--- a/Zend/tests/exit/exit_values.phpt
++++ b/Zend/tests/exit/exit_values.phpt
+@@ -49,7 +49,7 @@ try {
+ TEMPLATE;
+ 
+ $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
+-$command = $php . ' ' . escapeshellarg(FILE_PATH);
++$command = $php . ' --no-php-ini ' . escapeshellarg(FILE_PATH);
+ 
+ foreach ([FILE_CONTENT, str_replace('exit', 'die', FILE_CONTENT)] as $code) {
+     foreach ($values as $value) {
diff --git a/failed.txt b/failed.txt
index 3a96a30..4c7319c 100644
--- a/failed.txt
+++ b/failed.txt
@@ -2,19 +2,17 @@
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
-/var/lib/mock/scl83el8a/build.log:Tests failed     :    1
-/var/lib/mock/scl83el8x/build.log:Tests failed     :    1
-/var/lib/mock/scl83el9a/build.log:Tests failed     :    1
-/var/lib/mock/scl83el9x/build.log:Tests failed     :    1
-/var/lib/mock/scl83fc38x/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc39a/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc39x/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc40a/build.log:Tests failed    :    1
-/var/lib/mock/scl83fc40x/build.log:Tests failed    :    1
+/var/lib/mock/scl83el8a/build.log:Tests failed     :    0
+/var/lib/mock/scl83el8x/build.log:Tests failed     :    0
+/var/lib/mock/scl83el9a/build.log:Tests failed     :    0
+/var/lib/mock/scl83el9x/build.log:Tests failed     :    0
+/var/lib/mock/scl83fc38x/build.log:Tests failed    :    0
+/var/lib/mock/scl83fc39a/build.log:Tests failed    :    0
+/var/lib/mock/scl83fc39x/build.log:Tests failed    :    0
+/var/lib/mock/scl83fc40a/build.log:Tests failed    :    0
+/var/lib/mock/scl83fc40x/build.log:Tests failed    :    0
 
 
-all:
-	3	exit(false); [Zend/tests/exit/exit_values.phpt]
 
 
 (1)	proc_open give erratic test results :(
diff --git a/php.spec b/php.spec
index 8f2447c..7cb81ac 100644
--- a/php.spec
+++ b/php.spec
@@ -90,7 +90,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -159,6 +159,7 @@ Patch48: php-8.3.0-openssl-ec-param.patch
 Patch300: php-7.4.0-datetests.patch
 
 # WIP
+Patch400: 15420.patch
 
 BuildRequires: gnupg2
 BuildRequires: bzip2-devel
@@ -857,6 +858,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch -P300 -p1 -b .datetests
 
 # WIP patch
+%patch -P400 -p1
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE ZEND_LICENSE
@@ -1649,6 +1651,10 @@ fi
 
 
 %changelog
+* Thu Aug 15 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta3-2
+- test build for PR
+- open https://github.com/php/php-src/pull/15420 fix test settings
+
 * Thu Aug 15 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta3-1
 - Update to 8.4.0beta3
 
-- 
cgit