]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge pull request #807 from csanchezdll/issue696
authorTim Kientzle <kientzle@acm.org>
Sun, 11 Dec 2016 17:09:21 +0000 (09:09 -0800)
committerGitHub <noreply@github.com>
Sun, 11 Dec 2016 17:09:21 +0000 (09:09 -0800)
Issue 696: ppc64le mache ckech failure

1  2 
tar/test/test_option_lz4.c

index 1694e3ced37dc7aeb0a2d19a7f441385ade2800d,01ca6bbd7a5d3dfa9d22180bd8a49bf6e7d98b97..70fdaac3600f3511edf797290a4e9886ff6fda5d
@@@ -61,13 -61,19 +61,20 @@@ DEFINE_TEST(test_option_lz4
                if (strstr(p, "Can't write") != NULL && !canLz4()) {
                        skipping("This version of bsdtar uses an external lz4 program "
                            "but no such program is available on this system.");
 -                      return;
 +                      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);
 -              return;
 +              goto done;
        }
 +      free(p);
        /* Check that the archive file has an lz4 signature. */
        p = slurpfile(&s, "archive.out");
        assert(s > 2);