From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 30 Jan 2016 19:26:02 +0000 (-0800)
Subject: Fix LZ4 tests when liblz4 is not present
X-Git-Tag: v3.1.900a~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ef1e25029a81ab170d4aee604019104a54dd4e9;p=thirdparty%2Flibarchive.git

Fix LZ4 tests when liblz4 is not present
---

diff --git a/cpio/test/test_option_lz4.c b/cpio/test/test_option_lz4.c
index 889c14612..a007e3571 100644
--- a/cpio/test/test_option_lz4.c
+++ b/cpio/test/test_option_lz4.c
@@ -45,13 +45,13 @@ DEFINE_TEST(test_option_lz4)
 			    "without lz4 support");
 			return;
 		}
-		if (strstr(p, "Can't initialise filter") != NULL
+		if (strstr(p, "Filter exited with failure") != NULL
 		    && !canLz4()) {
 			skipping("This version of bsdtar uses an external lz4 program "
 			    "but no such program is available on this system.");
 			return;
 		}
-		failure("--lz4 option is broken");
+		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 e933eb4a3..a79c8827a 100644
--- a/tar/test/test_option_lz4.c
+++ b/tar/test/test_option_lz4.c
@@ -45,13 +45,13 @@ DEFINE_TEST(test_option_lz4)
 			    "without lz4 support");
 			return;
 		}
-		if (strstr(p, "Can't initialise filter") != NULL
+		if (strstr(p, "Filter exited with failure") != NULL
 		    && !canLz4()) {
 			skipping("This version of bsdtar uses an external lz4 program "
 			    "but no such program is available on this system.");
 			return;
 		}
-		failure("--lz4 option is broken");
+		failure("--lz4 option is broken: %s", p);
 		assertEqualInt(r, 0);
 		return;
 	}