Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #103925 from lopsided98/coreutils-tests-arm
coreutils, findutils, gnutls: fix build on 32-bit ARM
- Loading branch information
Showing
6 changed files
with
147 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
pkgs/development/libraries/gnutls/fix-gnulib-tests-arm.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. | ||
--- | ||
tests/test-perror2.c | 3 --- | ||
tests/test-strerror_r.c | 3 --- | ||
2 files changed, 6 deletions(-) | ||
|
||
diff --git a/gl/tests/test-perror2.c b/gl/tests/test-perror2.c | ||
index 1d14eda7b..c6214dd25 100644 | ||
--- a/gl/tests/test-perror2.c | ||
+++ b/gl/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/gl/tests/test-strerror_r.c b/gl/tests/test-strerror_r.c | ||
index b11d6fd9f..c1dbcf837 100644 | ||
--- a/gl/tests/test-strerror_r.c | ||
+++ b/gl/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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. | ||
--- | ||
tests/test-perror2.c | 3 --- | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. | ||
--- | ||
tests/test-perror2.c | 3 --- | ||
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 | ||
|