diff options
| author | Tim Kientzle <kientzle@acm.org> | 2016-01-30 11:26:02 -0800 |
|---|---|---|
| committer | Tim Kientzle <kientzle@acm.org> | 2016-01-30 11:26:02 -0800 |
| commit | 0ef1e25029a81ab170d4aee604019104a54dd4e9 (patch) | |
| tree | f1a1a24fc6cb688ed8c0540a8ea5315723959594 | |
| parent | 581c7f3aa64dff936fecba254cf8dc9caf39a537 (diff) | |
| download | libarchive-0ef1e25029a81ab170d4aee604019104a54dd4e9.tar.gz | |
Fix LZ4 tests when liblz4 is not present
| -rw-r--r-- | cpio/test/test_option_lz4.c | 4 | ||||
| -rw-r--r-- | tar/test/test_option_lz4.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpio/test/test_option_lz4.c b/cpio/test/test_option_lz4.c index 889c1461..a007e357 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 e933eb4a..a79c8827 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; } |