From owner-p4-projects@FreeBSD.ORG  Sat Aug  9 13:31:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4EFCB106568E; Sat,  9 Aug 2008 13:31:07 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12723106568D
	for <perforce@FreeBSD.org>; Sat,  9 Aug 2008 13:31:07 +0000 (UTC)
	(envelope-from strauss@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F418C8FC22
	for <perforce@FreeBSD.org>; Sat,  9 Aug 2008 13:31:06 +0000 (UTC)
	(envelope-from strauss@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m79DV6OZ084050
	for <perforce@FreeBSD.org>; Sat, 9 Aug 2008 13:31:06 GMT
	(envelope-from strauss@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m79DV6Fa084048
	for perforce@freebsd.org; Sat, 9 Aug 2008 13:31:06 GMT
	(envelope-from strauss@FreeBSD.org)
Date: Sat, 9 Aug 2008 13:31:06 GMT
Message-Id: <200808091331.m79DV6Fa084048@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	strauss@FreeBSD.org using -f
From: Anselm Strauss <strauss@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 146987 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2008 13:31:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=146987

Change 146987 by strauss@strauss_marvelman on 2008/08/09 13:30:40

	Better test for step-by-step computed CRC32.

Affected files ...

.. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#6 edit

Differences ...

==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#6 (text+ko) ====

@@ -12,10 +12,12 @@
 {
 	struct archive *a;
 	struct archive_entry *entry;
-	char data[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
+	char data1[] = {'1', '2', '3', '4', '5'};	
+	char data2[] = {'6', '7', '8', '9', '0'};
 	char buff[100000];
 	const char *p, *q, *buffend;
 	size_t used;
+	int crc;
 
 	/* Create new ZIP archive in memory without padding. */
 	assert((a = archive_write_new()) != NULL);
@@ -38,7 +40,8 @@
 	archive_entry_set_ino(entry, 89);
 	archive_entry_set_nlink(entry, 1);
 	assertEqualIntA(a, 0, archive_write_header(a, entry));
-	assertEqualIntA(a, 10, archive_write_data(a, data, sizeof(data)));
+	assertEqualIntA(a, sizeof(data1), archive_write_data(a, data1, sizeof(data1)));
+	assertEqualIntA(a, sizeof(data2), archive_write_data(a, data2, sizeof(data2)));
 	archive_entry_free(entry);
 	
 	/* TODO: Also test non-regular file and directory entries. */
@@ -80,7 +83,9 @@
 	/* assertEqualInt(i2(p + 10), XXXX); */ /* Compression method */
 	/* assertEqualInt(i2(p + 12), XXXX); */ /* File time */
 	/* assertEqualInt(i2(p + 14), XXXX); */ /* File date */
-	assertEqualInt(i4(p + 16), crc32(0, &data, sizeof(data))); /* CRC-32 */
+	crc = crc32(0, &data1, sizeof(data1));
+	crc = crc32(crc, &data2, sizeof(data2));
+	assertEqualInt(i4(p + 16), crc); /* CRC-32 */
 	/* assertEqualInt(i4(p + 20), XXXX); */ /* Compressed size */
 	/* assertEqualInt(i4(p + 24), XXXX); */ /* Uncompressed size */
 	/* assertEqualInt(i2(p + 28), XXXX); */ /* Filename length */