diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-03-05 00:31:48 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-03-05 00:31:48 +0000 |
| commit | 1d35cb198bc3dfc1324b7176dd015d2d4f577534 (patch) | |
| tree | 20b0b85b2df81bdc3a0991bd065c608192a888fe /lib/libarchive/test/test_read_format_tz.c | |
| parent | 1a8d7ef92049f314a651a656e316df16cd8f7946 (diff) | |
| download | FreeBSD-src-1d35cb198bc3dfc1324b7176dd015d2d4f577534.zip FreeBSD-src-1d35cb198bc3dfc1324b7176dd015d2d4f577534.tar.gz | |
Merge r341,r345,r346,347 from libarchive.googlecode.com: Style
fixes to test harness and a few extra guards to detect tests
that can't succeed on certain platforms.
Diffstat (limited to 'lib/libarchive/test/test_read_format_tz.c')
| -rw-r--r-- | lib/libarchive/test/test_read_format_tz.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/libarchive/test/test_read_format_tz.c b/lib/libarchive/test/test_read_format_tz.c index 94a2841..3dd001f 100644 --- a/lib/libarchive/test/test_read_format_tz.c +++ b/lib/libarchive/test/test_read_format_tz.c @@ -39,17 +39,22 @@ DEFINE_TEST(test_read_format_tz) struct archive_entry *ae; struct archive *a; assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_compression_all(a)); - assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_open_memory(a, archive, sizeof(archive))); - assertA(0 == archive_read_next_header(a, &ae)); - assertA(archive_compression(a) == ARCHIVE_COMPRESSION_COMPRESS); - assertA(archive_format(a) == ARCHIVE_FORMAT_TAR_USTAR); - assert(0 == archive_read_close(a)); + 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)); + failure("archive_compression_name(a)=\"%s\"", + archive_compression_name(a)); + assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS); + failure("archive_format_name(a)=\"%s\"", archive_format_name(a)); + assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); #if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); #else - assert(0 == archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); #endif } |
