Merge pull request #807 from csanchezdll/issue696

Issue 696: ppc64le mache ckech failure

1 files changed, 7 insertions, 0 deletions

diff --git a/cpio/test/test_option_lz4.c b/cpio/test/test_option_lz4.c
index d430ac75..afd683dd 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;