Minor style update to cpio_bin_bz2 read test.

Make tar_sparse read test a bit more robust; have it stop
after the first header read failure.

SVN-Revision: 238

diff --git a/libarchive/test/test_read_format_cpio_bin_bz2.c b/libarchive/test/test_read_format_cpio_bin_bz2.c
index 85b71a555d1026a1f2ef94ed980167472635b768..67dfbf6ab2a351dc66227dd3044c532f9b529ec4 100644 (file)
--- a/libarchive/test/test_read_format_cpio_bin_bz2.c
+++ b/libarchive/test/test_read_format_cpio_bin_bz2.c
@@ -37,10 +37,12 @@ DEFINE_TEST(test_read_format_cpio_bin_bz2)
        struct archive_entry *ae;
        struct archive *a;
        assert((a = archive_read_new()) != NULL);
-       assert(0 == archive_read_support_compression_all(a));
-       assert(0 == archive_read_support_format_all(a));
-       assert(0 == archive_read_open_memory(a, archive, sizeof(archive)));
-       assert(0 == archive_read_next_header(a, &ae));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_support_compression_all(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_open_memory(a, archive, sizeof(archive)));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assert(archive_compression(a) == ARCHIVE_COMPRESSION_BZIP2);
        assert(archive_format(a) == ARCHIVE_FORMAT_CPIO_BIN_LE);
        assert(0 == archive_read_close(a));

diff --git a/libarchive/test/test_read_format_gtar_sparse.c b/libarchive/test/test_read_format_gtar_sparse.c
index 32aecf9e779671985ac6872ae34c0a85685fc489..a9abe1f3bf08ce43391e3b6629f8972f302c1f13 100644 (file)
--- a/libarchive/test/test_read_format_gtar_sparse.c
+++ b/libarchive/test/test_read_format_gtar_sparse.c
@@ -201,7 +201,10 @@ verify_archive_file(const char *name, struct archive_contents *ac)
        while (ac->filename != NULL) {
                struct contents *cts = ac->contents;
 
-               assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
+               if (!assertEqualIntA(a, 0, archive_read_next_header(a, &ae))) {
+                       assert(0 == archive_read_finish(a));
+                       return;
+               }
                failure("Name mismatch in archive %s", name);
                assertEqualString(ac->filename, archive_entry_pathname(ae));