Make a couple of tests a bit more informative and a bit more robust.

SVN-Revision: 224

diff --git a/libarchive/test/test_read_pax_truncated.c b/libarchive/test/test_read_pax_truncated.c
index 6c4b149f5117d0860015ee211d18188c81fdd3a2..b5c070678f89bdff1e2990ea9935574a44a574f6 100644 (file)
--- a/libarchive/test/test_read_pax_truncated.c
+++ b/libarchive/test/test_read_pax_truncated.c
@@ -98,9 +98,13 @@ DEFINE_TEST(test_read_pax_truncated)
                 * does not return an error if it can't consume
                 * it.) */
                if (i < 1536 + 512*((filedata_size + 511)/512) + 512) {
-                       assertA(ARCHIVE_FATAL == archive_read_next_header(a, &ae));
+                       failure("i=%d minsize=%d", i,
+                           1536 + 512*((filedata_size + 511)/512) + 512);
+                       assertEqualIntA(a, ARCHIVE_FATAL,
+                           archive_read_next_header(a, &ae));
                } else {
-                       assertA(ARCHIVE_EOF == archive_read_next_header(a, &ae));
+                       assertEqualIntA(a, ARCHIVE_EOF,
+                           archive_read_next_header(a, &ae));
                }
        wrap_up:
                assert(0 == archive_read_close(a));
@@ -141,9 +145,11 @@ DEFINE_TEST(test_read_pax_truncated)
                 * does not return an error if it can't consume
                 * it.) */
                if (i < 1536 + 512*((filedata_size + 511)/512) + 512) {
-                       assertA(ARCHIVE_FATAL == archive_read_next_header(a, &ae));
+                       assertEqualIntA(a, ARCHIVE_FATAL,
+                           archive_read_next_header(a, &ae));
                } else {
-                       assertA(ARCHIVE_EOF == archive_read_next_header(a, &ae));
+                       assertEqualIntA(a, ARCHIVE_EOF,
+                           archive_read_next_header(a, &ae));
                }
        wrap_up2:
                assert(0 == archive_read_close(a));

diff --git a/libarchive/test/test_write_format_cpio.c b/libarchive/test/test_write_format_cpio.c
index 136636d652c026f6eabdbdd163aa204d498b5340..a818dfdbb1f28086a8ecae1f86408751ed63ec45 100644 (file)
--- a/libarchive/test/test_write_format_cpio.c
+++ b/libarchive/test/test_write_format_cpio.c
@@ -134,7 +134,10 @@ test_format(int    (*set_format)(struct archive *))
        assertA(0 == archive_read_support_compression_all(a));
        assertA(0 == archive_read_open_memory(a, buff, used));
 
-       assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
+       if (!assertEqualIntA(a, 0, archive_read_next_header(a, &ae))) {
+               archive_read_finish(a);
+               return;
+       }
 
        assertEqualInt(1, archive_entry_mtime(ae));
        /* Not the same as above: cpio doesn't store hi-res times. */