From: Tim Kientzle <kientzle@acm.org>
Date: Sun, 11 Dec 2016 17:09:21 +0000 (-0800)
Subject: Merge pull request #807 from csanchezdll/issue696
X-Git-Tag: v3.3.0~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54546be8a7a2e69738247d68f4f6c253430a3d6f;p=thirdparty%2Flibarchive.git

Merge pull request #807 from csanchezdll/issue696

Issue 696: ppc64le mache ckech failure
---

54546be8a7a2e69738247d68f4f6c253430a3d6f
diff --cc tar/test/test_option_lz4.c
index 1694e3ced,01ca6bbd7..70fdaac36
--- a/tar/test/test_option_lz4.c
+++ b/tar/test/test_option_lz4.c
@@@ -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);