svn commit: r189385 - head/lib/libarchive/test

[Tim Kientzle]

Author: kientzle
Date: Thu Mar  5 00:42:50 2009
New Revision: 189385
URL: http://svn.freebsd.org/changeset/base/189385

Log:
  Merge r357 from libarchive.googlecode.com: bzip2 compression
  support can always be enabled even if bzlib doesn't exist on
  this platform; don't give up until we fail to open the file.

Modified:
  head/lib/libarchive/test/test_read_format_isorr_bz2.c

Modified: head/lib/libarchive/test/test_read_format_isorr_bz2.c
==============================================================================
--- head/lib/libarchive/test/test_read_format_isorr_bz2.c	Thu Mar  5 00:41:02 2009	(r189384)
+++ head/lib/libarchive/test/test_read_format_isorr_bz2.c	Thu Mar  5 00:42:50 2009	(r189385)
@@ -55,15 +55,15 @@ DEFINE_TEST(test_read_format_isorr_bz2)
 
 	extract_reference_file(refname);
 	assert((a = archive_read_new()) != NULL);
-	r = archive_read_support_compression_bzip2(a);
+	assertEqualInt(0, archive_read_support_compression_bzip2(a));
+	assertEqualInt(0, archive_read_support_format_all(a));
+	r = archive_read_open_filename(a, refname, 10240);
 	if (r == ARCHIVE_FATAL) {
 		skipping("Bzip2 decompression unsupported on this platform");
 		archive_read_finish(a);
 		return;
 	}
 	assertEqualInt(0, r);
-	assertEqualInt(0, archive_read_support_format_all(a));
-	assertEqualInt(0, archive_read_open_filename(a, refname, 10240));
 
 	/* First entry is '.' root directory. */
 	assertEqualInt(0, archive_read_next_header(a, &ae));