all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 0fafacf4c2208c8b1e5a38da28a1a22a8ad6af8e 2025 bytes (raw)
name: gnu/packages/patches/libarchive-issue-696.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
 
From ba1665ee3d1c593c5baf9264cd5c5250eb0c515f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20de=20La=20Lama?=
 <csanchezdll@gmail.com>
Date: Wed, 19 Oct 2016 09:12:18 +0200
Subject: [PATCH] Issue 696: ppc64le mache ckech failure

This issue is not ppc64le specific. I have experienced on my
4.4.22-gnu #1 SMP 1 i686 GNU/Linux. Might be dependant on kernel
version and/or machine load. POSIX says errors after posix_spawnp
returns can be signaled by child exitting with an 127 exit code.
---
 cpio/test/test_option_lz4.c | 7 +++++++
 tar/test/test_option_lz4.c  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/cpio/test/test_option_lz4.c b/cpio/test/test_option_lz4.c
index d430ac7..afd683d 100644
--- a/cpio/test/test_option_lz4.c
+++ b/cpio/test/test_option_lz4.c
@@ -63,6 +63,13 @@ DEFINE_TEST(test_option_lz4)
 			    "but no such program is available on this system.");
 			return;
 		}
+		/* On some systems the error won't be detected until closing
+		   time, by a 127 exit error returned by waitpid. */
+		if (strstr(p, "Error closing") != NULL && !canLz4()) {
+			skipping("This version of bsdcpio uses an external lz4 program "
+			    "but no such program is available on this system.");
+			return;
+		}
 		failure("--lz4 option is broken: %s", p);
 		assertEqualInt(r, 0);
 		return;
diff --git a/tar/test/test_option_lz4.c b/tar/test/test_option_lz4.c
index 5dc9452..01ca6bb 100644
--- a/tar/test/test_option_lz4.c
+++ b/tar/test/test_option_lz4.c
@@ -63,6 +63,13 @@ DEFINE_TEST(test_option_lz4)
 			    "but no such program is available on this system.");
 			return;
 		}
+		/* On some systems the error won't be detected until closing
+		   time, by a 127 exit error returned by waitpid. */
+		if (strstr(p, "Error closing") != NULL && !canLz4()) {
+			skipping("This version of bsdcpio uses an external lz4 program "
+			    "but no such program is available on this system.");
+			return;
+		}
 		failure("--lz4 option is broken: %s", p);
 		assertEqualInt(r, 0);
 		return;

debug log:

solving 0fafacf ...
found 0fafacf in https://yhetil.org/guix/7tshrsd2jw.fsf@gmail.com/

applying [1/1] https://yhetil.org/guix/7tshrsd2jw.fsf@gmail.com/
diff --git a/gnu/packages/patches/libarchive-issue-696.patch b/gnu/packages/patches/libarchive-issue-696.patch
new file mode 100644
index 0000000..0fafacf

1:27: space before tab in indent.
 			    "but no such program is available on this system.");
1:28: space before tab in indent.
 			return;
1:29: space before tab in indent.
 		}
1:37: space before tab in indent.
 		failure("--lz4 option is broken: %s", p);
1:38: space before tab in indent.
 		assertEqualInt(r, 0);
Checking patch gnu/packages/patches/libarchive-issue-696.patch...
Applied patch gnu/packages/patches/libarchive-issue-696.patch cleanly.
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.

index at:
100644 0fafacf4c2208c8b1e5a38da28a1a22a8ad6af8e	gnu/packages/patches/libarchive-issue-696.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.