mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 15:11:35 +00:00
b70430a3dd
Adds an upstream patch to fix failing tests. The patch actually affects gnulib, which is included as a vendored dependency.
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
>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
|
|
|