From owner-svn-src-head@FreeBSD.ORG  Sat Dec  6 05:58:25 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30BFD1065672;
	Sat,  6 Dec 2008 05:58:25 +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 1FC4A8FC08;
	Sat,  6 Dec 2008 05:58:25 +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 mB65wPVI084463;
	Sat, 6 Dec 2008 05:58:25 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB65wPPq084462;
	Sat, 6 Dec 2008 05:58:25 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200812060558.mB65wPPq084462@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 6 Dec 2008 05:58:24 +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: r185668 - head/lib/libarchive/test
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Dec 2008 05:58:25 -0000

Author: kientzle
Date: Sat Dec  6 05:58:24 2008
New Revision: 185668
URL: http://svn.freebsd.org/changeset/base/185668

Log:
  Recover from a test failure here.

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

Modified: head/lib/libarchive/test/test_read_format_gtar_sparse.c
==============================================================================
--- head/lib/libarchive/test/test_read_format_gtar_sparse.c	Sat Dec  6 05:56:43 2008	(r185667)
+++ head/lib/libarchive/test/test_read_format_gtar_sparse.c	Sat Dec  6 05:58:24 2008	(r185668)
@@ -201,7 +201,10 @@ verify_archive_file(const char *name, st
 	while (ac->filename != NULL) {
 		struct contents *cts = ac->contents;
 
-		assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
+		if (!assertEqualIntA(a, 0, archive_read_next_header(a, &ae))) {
+			assert(0 == archive_read_finish(a));
+			return;
+		}
 		failure("Name mismatch in archive %s", name);
 		assertEqualString(ac->filename, archive_entry_pathname(ae));