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.

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/libarchive/test/test_read_compress_program.c b/lib/libarchive/test/test_read_compress_program.c
index 617593a..a6626dc 100644
--- a/lib/libarchive/test/test_read_compress_program.c
+++ b/lib/libarchive/test/test_read_compress_program.c
@@ -42,16 +42,20 @@ DEFINE_TEST(test_read_compress_program)
 	struct archive_entry *ae;
 	struct archive *a;
 	assert((a = archive_read_new()) != NULL);
-	assertEqualIntA(a, 0, archive_read_support_compression_none(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	    archive_read_support_compression_none(a));
 	r = archive_read_support_compression_program(a, "gunzip");
 	if (r == ARCHIVE_FATAL) {
 		skipping("archive_read_support_compression_program() unsupported on this platform");
 		return;
 	}
 	assertEqualIntA(a, ARCHIVE_OK, r);
-	assert(0 == archive_read_support_format_all(a));
-	assertEqualIntA(a, 0, archive_read_open_memory(a, archive, sizeof(archive)));
-	assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
+	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_PROGRAM);
 	assert(archive_format(a) == ARCHIVE_FORMAT_TAR_USTAR);
 	assert(0 == archive_read_close(a));