From 0feb1dd6dbcdecaab07d7f3b614e0209fabaea2f Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sat, 8 Nov 2008 08:59:51 -0500 Subject: [PATCH] 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 --- libarchive/test/test_read_format_cpio_bin_bz2.c | 10 ++++++---- libarchive/test/test_read_format_gtar_sparse.c | 5 ++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libarchive/test/test_read_format_cpio_bin_bz2.c b/libarchive/test/test_read_format_cpio_bin_bz2.c index 85b71a555..67dfbf6ab 100644 --- 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 32aecf9e7..a9abe1f3b 100644 --- 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)); -- 2.47.3