[packages/m4] - disable SIGPIPE tests from test-execute.sh (fail on builders)
qboosh
qboosh at pld-linux.org
Sun Jun 13 18:08:15 CEST 2021
commit 4a17833d3a279474522b46d7b4797cfcaf315db1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jun 13 18:10:58 2021 +0200
- disable SIGPIPE tests from test-execute.sh (fail on builders)
m4-tests-diag.patch | 18 ------------------
m4.spec | 5 +++--
2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/m4.spec b/m4.spec
index 67f66b8..d9bae56 100644
--- a/m4.spec
+++ b/m4.spec
@@ -16,7 +16,6 @@ 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
@@ -76,7 +75,6 @@ Statyczna biblioteka m4.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%{__sed} -i '1 i @documentencoding ISO-8859-1' doc/m4.texi
@@ -86,6 +84,9 @@ touch checks/stamp-checks
# PLD builders stub resolv.conf file, use another one for tests
%{__sed} -i -e 's,/etc/resolv\.conf,/etc/nsswitch.conf,' tests/test-read-file.c
+# SIGPIPE tests fail on builders due to unknown reason (detached terminal???)
+# raise(SIGPIPE) does nothing, child process exits with return code 71
+%{__sed} -i -e 's/ 3 4 //' tests/test-execute.sh
%build
%configure \
diff --git a/m4-tests-diag.patch b/m4-tests-diag.patch
deleted file mode 100644
index a6afa0e..0000000
--- a/m4-tests-diag.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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/4a17833d3a279474522b46d7b4797cfcaf315db1
More information about the pld-cvs-commit
mailing list