From owner-svn-src-head@FreeBSD.ORG  Sat Dec  6 06:02:27 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 344A01065676;
	Sat,  6 Dec 2008 06:02:27 +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 2352D8FC1F;
	Sat,  6 Dec 2008 06:02:27 +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 mB662RBW084708;
	Sat, 6 Dec 2008 06:02:27 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB662RoX084707;
	Sat, 6 Dec 2008 06:02:27 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200812060602.mB662RoX084707@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 6 Dec 2008 06:02:27 +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: r185672 - 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 06:02:27 -0000

Author: kientzle
Date: Sat Dec  6 06:02:26 2008
New Revision: 185672
URL: http://svn.freebsd.org/changeset/base/185672

Log:
  Recover after test failure.

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

Modified: head/lib/libarchive/test/test_write_format_cpio.c
==============================================================================
--- head/lib/libarchive/test/test_write_format_cpio.c	Sat Dec  6 06:01:50 2008	(r185671)
+++ head/lib/libarchive/test/test_write_format_cpio.c	Sat Dec  6 06:02:26 2008	(r185672)
@@ -134,7 +134,10 @@ test_format(int	(*set_format)(struct arc
 	assertA(0 == archive_read_support_compression_all(a));
 	assertA(0 == archive_read_open_memory(a, buff, used));
 
-	assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
+	if (!assertEqualIntA(a, 0, archive_read_next_header(a, &ae))) {
+		archive_read_finish(a);
+		return;
+	}
 
 	assertEqualInt(1, archive_entry_mtime(ae));
 	/* Not the same as above: cpio doesn't store hi-res times. */