[packages/m4] - added tests-diag patch (try to debug test failures on builder)

qboosh qboosh at pld-linux.org
Sun Jun 13 08:44:01 CEST 2021


commit 72064cee3babb4e78579ff9146e7234eb904ac1b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 13 08:46:46 2021 +0200

    - added tests-diag patch (try to debug test failures on builder)

 m4-tests-diag.patch | 18 ++++++++++++++++++
 m4.spec             | 11 ++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/m4.spec b/m4.spec
index e780943..67f66b8 100644
--- a/m4.spec
+++ b/m4.spec
@@ -16,6 +16,7 @@ Group:		Applications/Text
 Source0:	https://ftp.gnu.org/gnu/m4/%{name}-%{version}.tar.xz
 # Source0-md5:	0d90823e1426f1da2fd872df0311298d
 Patch0:		%{name}-info.patch
+Patch1:		%{name}-tests-diag.patch
 URL:		http://www.gnu.org/software/m4/
 BuildRequires:	gettext-tools >= 0.19.2
 BuildRequires:	tar >= 1:1.22
@@ -75,6 +76,7 @@ Statyczna biblioteka m4.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i '1 i @documentencoding ISO-8859-1' doc/m4.texi
 
@@ -93,7 +95,14 @@ touch checks/stamp-checks
 
 %{__make}
 
-%{?with_tests:%{__make} check || cat tests/test-suite.log}
+%if %{with tests}
+st=0
+%{__make} check || st=1
+if [ "$st" -ne 0 ]; then
+	cat tests/test-suite.log
+	exit 1
+fi
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/m4-tests-diag.patch b/m4-tests-diag.patch
new file mode 100644
index 0000000..a6afa0e
--- /dev/null
+++ b/m4-tests-diag.patch
@@ -0,0 +1,18 @@
+--- m4-1.4.19/tests/test-execute-main.c.orig	2021-05-19 16:35:46.000000000 +0200
++++ m4-1.4.19/tests/test-execute-main.c	2021-06-13 08:38:25.162916625 +0200
+@@ -136,6 +136,7 @@
+         int termsig = 0x7DEADBEE;
+         int ret = execute (progname, prog_argv[0], prog_argv, NULL,
+                            false, false, false, false, true, false, &termsig);
++        fprintf(stderr, "RET %d\n", ret);
+         ASSERT (ret == 127);
+         ASSERT (termsig == SIGPIPE);
+       }
+@@ -149,6 +150,7 @@
+         int termsig = 0x7DEADBEE;
+         int ret = execute (progname, prog_argv[0], prog_argv, NULL,
+                            true, false, false, false, true, false, &termsig);
++        fprintf(stderr, "RET %d\n", ret);
+         ASSERT (ret == 0);
+         ASSERT (termsig == SIGPIPE);
+       }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/m4.git/commitdiff/72064cee3babb4e78579ff9146e7234eb904ac1b



More information about the pld-cvs-commit mailing list