commit:     2f50bca02b84869cd6ac5c2ba6fb5caa05fcb362
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 11:26:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 11:41:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f50bca0

sys-devel/m4: backport race condition fix for tests

Test-only fix.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../m4/files/m4-1.4.19-race-condition-tests.patch  | 34 ++++++++++++++++++++++
 sys-devel/m4/m4-1.4.19-r2.ebuild                   |  3 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/sys-devel/m4/files/m4-1.4.19-race-condition-tests.patch 
b/sys-devel/m4/files/m4-1.4.19-race-condition-tests.patch
new file mode 100644
index 000000000000..c212777dcd3e
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.19-race-condition-tests.patch
@@ -0,0 +1,34 @@
+https://lists.gnu.org/archive/html/bug-m4/2022-12/msg00000.html
+https://lists.gnu.org/archive/html/bug-m4/2022-12/txtmGJxjX3osy.txt
+
+Fix a sporadic failure of the test-posix_spawn-script test.
+
+From a3efddb96f5f121b8a5bb1310dc82407546fd255 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <[email protected]>
+Date: Thu, 22 Dec 2022 21:19:34 -0800
+Subject: [PATCH] posix_spawnp-tests: fix filename typo
+
+Problem reported for GNU m4 by Mitchell Dorrell in:
+https://lists.gnu.org/r/bug-m4/2022-12/msg00000.html
+* tests/test-posix_spawnp-script.c (DATA_FILENAME):
+Fix typo in file name that caused race with
+test-posix_spawn-script.c.
+---
+ tests/test-posix_spawnp-script.c | 2 +-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test-posix_spawnp-script.c 
b/tests/test-posix_spawnp-script.c
+index 1e5fc5c110..d2035ed63e 100644
+--- a/tests/test-posix_spawnp-script.c
++++ b/tests/test-posix_spawnp-script.c
+@@ -28,7 +28,7 @@
+ 
+ #include "macros.h"
+ 
+-#define DATA_FILENAME "test-posix_spawn-script.tmp"
++#define DATA_FILENAME "test-posix_spawnp-script.tmp"
+ 
+ int
+ main ()
+-- 
+2.25.1

diff --git a/sys-devel/m4/m4-1.4.19-r2.ebuild b/sys-devel/m4/m4-1.4.19-r2.ebuild
index efb93a8e18b9..6c21702d71ba 100644
--- a/sys-devel/m4/m4-1.4.19-r2.ebuild
+++ b/sys-devel/m4/m4-1.4.19-r2.ebuild
@@ -41,7 +41,8 @@ PATCHES=(
        "${FILESDIR}"/loong-fix-build.patch
        "${FILESDIR}"/${PN}-1.4.19-make-4.4-tests.patch
        "${WORKDIR}"/${P}-test-198-sysval-r1.patch
-       "${FILESDIR}"/${PN}-1.4.19-fortify-source.patch
+       "${FILESDIR}"/${P}-fortify-source.patch
+       "${FILESDIR}"/${P}-race-condition-tests.patch
 )
 
 src_unpack() {

Reply via email to