rpms/grep
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove some non-portable tests that fail on armv7hl (Paul Eggert)

Browse Source
This commit is contained in:
Adam Williamson 2020-08-28 11:00:47 -07:00
parent 28284b81d5
commit 509816512b
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
0001-perror-strerror_r-remove-unportable-tests.patch Normal file
View File

@ -0,0 +1,45 @@
>From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 27 Aug 2020 17:52:58 -0700
Subject: [PATCH] perror, strerror_r: remove unportable tests
Problem reported by Florian Weimer in:
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
* tests/test-perror2.c (main):
* tests/test-strerror_r.c (main): Omit unportable tests.
---
gnulib-tests/test-perror2.c | 3 ---
gnulib-tests/test-strerror_r.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c
index 1d14eda7b..c6214dd25 100644
--- a/gnulib-tests/test-perror2.c
+++ b/gnulib-tests/test-perror2.c
@@ -79,9 +79,6 @@ main (void)
errno = -5;
perror ("");
ASSERT (!ferror (stderr));
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
ASSERT (STREQ (msg4, str4));
free (str1);
diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c
index b11d6fd9f..c1dbcf837 100644
--- a/gnulib-tests/test-strerror_r.c
+++ b/gnulib-tests/test-strerror_r.c
@@ -165,9 +165,6 @@ main (void)
strerror_r (EACCES, buf, sizeof buf);
strerror_r (-5, buf, sizeof buf);
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
ASSERT (STREQ (msg4, str4));
free (str1);
--
2.17.1

8
grep.spec
View File

@ -16,6 +16,11 @@ Patch0: grep-3.4-man-fix-gs.patch
Patch1: grep-3.4-help-align.patch Patch1: grep-3.4-help-align.patch
# upstream ticket 28105 # upstream ticket 28105
Patch2: 0001-Revert-L-exit-status-change-introduced-in-grep-3.2.patch Patch2: 0001-Revert-L-exit-status-change-introduced-in-grep-3.2.patch
# https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00220.html
# https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00225.html
# removes some tests that fail on armv7hl, by Paul Eggert
# re-diffed to apply to 3.4
Patch3: 0001-perror-strerror_r-remove-unportable-tests.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
@ -40,6 +45,7 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
%patch0 -p1 -b .man-fix-gs %patch0 -p1 -b .man-fix-gs
%patch1 -p1 -b .help-align %patch1 -p1 -b .help-align
%patch2 -p1 -b .zgrep-fix %patch2 -p1 -b .zgrep-fix
%patch3 -p1 -b .remove-broken-tests
%build %build
%global BUILD_FLAGS $RPM_OPT_FLAGS %global BUILD_FLAGS $RPM_OPT_FLAGS
@ -85,6 +91,8 @@ make check
* Wed Aug 26 2020 Adam Williamson <awilliam@redhat.com> - 3.4-5 * Wed Aug 26 2020 Adam Williamson <awilliam@redhat.com> - 3.4-5
- Backport fix for upstream #28105 to fix zgrep - Backport fix for upstream #28105 to fix zgrep
Resolves: rhbz#1872913 Resolves: rhbz#1872913
- Remove some non-portable tests that fail on armv7hl (Paul Eggert)
Resolves: rhbz#1863830
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-4 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-4
- Second attempt - Rebuilt for - Second attempt - Rebuilt for