]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix LZ4 tests when liblz4 is not present
authorTim Kientzle <kientzle@acm.org>
Sat, 30 Jan 2016 19:26:02 +0000 (11:26 -0800)
committerTim Kientzle <kientzle@acm.org>
Sat, 30 Jan 2016 19:26:02 +0000 (11:26 -0800)
cpio/test/test_option_lz4.c
tar/test/test_option_lz4.c

index 889c1461271aa8be82b962ed424f7932d86c696f..a007e3571289cce07d3059a6f8f4bb148aad8932 100644 (file)
@@ -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;
        }
index e933eb4a351843c211fe84bb22cc5f2be1a68ec9..a79c8827aa2c94b234beb214a2921e100ecf7ecc 100644 (file)
@@ -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;
        }