diff options
author | Tim Kientzle <kientzle@acm.org> | 2016-12-11 09:09:21 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-11 09:09:21 -0800 |
commit | 54546be8a7a2e69738247d68f4f6c253430a3d6f (patch) | |
tree | b3b1f62c5ef1c64d54fe938b8425ed8721b5b633 | |
parent | 9394219328f775f02d4b06949c26f309886e1f24 (diff) | |
parent | b63fd0d96b810b917cc684693b532c4ac7171f82 (diff) | |
download | libarchive-54546be8a7a2e69738247d68f4f6c253430a3d6f.tar.gz |
Merge pull request #807 from csanchezdll/issue696
Issue 696: ppc64le mache ckech failure
-rw-r--r-- | cpio/test/test_option_lz4.c | 7 | ||||
-rw-r--r-- | tar/test/test_option_lz4.c | 7 |
2 files changed, 14 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; diff --git a/tar/test/test_option_lz4.c b/tar/test/test_option_lz4.c index 1694e3ce..70fdaac3 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."); goto done; } + /* 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); goto done; |