From owner-svn-src-all@FreeBSD.ORG  Thu Mar  5 00:42:51 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C194106566B;
	Thu,  5 Mar 2009 00:42:51 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2ACC98FC0C;
	Thu,  5 Mar 2009 00:42:51 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n250gpqd057822;
	Thu, 5 Mar 2009 00:42:51 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n250gpKd057821;
	Thu, 5 Mar 2009 00:42:51 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903050042.n250gpKd057821@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Thu, 5 Mar 2009 00:42:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189385 - head/lib/libarchive/test
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Mar 2009 00:42:51 -0000

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));