From owner-svn-src-head@FreeBSD.ORG  Sun Mar  8 05:14:16 2009
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 D0E4B106566B;
	Sun,  8 Mar 2009 05:14:16 +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 8B0108FC14;
	Sun,  8 Mar 2009 05:14:16 +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 n285EGth072666;
	Sun, 8 Mar 2009 05:14:16 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n285EGGb072665;
	Sun, 8 Mar 2009 05:14:16 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903080514.n285EGGb072665@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sun, 8 Mar 2009 05:14:16 +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: r189511 - head/usr.bin/tar/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: Sun, 08 Mar 2009 05:14:17 -0000

Author: kientzle
Date: Sun Mar  8 05:14:16 2009
New Revision: 189511
URL: http://svn.freebsd.org/changeset/base/189511

Log:
  Merge r278 from libarchive.googlecode.com:  Reduce the number of
  patterns tested here from 200 to 170, which seems to be the
  most that Cygwin can handle.

Modified:
  head/usr.bin/tar/test/test_copy.c

Modified: head/usr.bin/tar/test/test_copy.c
==============================================================================
--- head/usr.bin/tar/test/test_copy.c	Sun Mar  8 05:10:51 2009	(r189510)
+++ head/usr.bin/tar/test/test_copy.c	Sun Mar  8 05:14:16 2009	(r189511)
@@ -25,6 +25,8 @@
 #include "test.h"
 __FBSDID("$FreeBSD$");
 
+#define	LOOP_MAX	170
+
 static void
 create_tree(void)
 {
@@ -41,7 +43,7 @@ create_tree(void)
 	assertEqualInt(0, mkdir("s", 0775));
 	assertEqualInt(0, mkdir("d", 0775));
 
-	for (i = 0; i < 200; i++) {
+	for (i = 0; i < LOOP_MAX; i++) {
 		buff[0] = 'f';
 		buff[1] = '/';
 		/* Create a file named "f/abcdef..." */
@@ -97,7 +99,7 @@ verify_tree(int limit)
 	struct dirent *de;
 
 	/* Generate the names we know should be there and verify them. */
-	for (i = 1; i < 200; i++) {
+	for (i = 1; i < LOOP_MAX; i++) {
 		/* Generate a base name of the correct length. */
 		for (j = 0; j < i; ++j)
 			filename[j] = 'a' + (j % 26);
@@ -219,7 +221,7 @@ verify_tree(int limit)
 				}
 				/* Our files have very particular filename patterns. */
 				if (p[0] != '.' || (p[1] != '.' && p[1] != '\0')) {
-					for (i = 0; p[i] != '\0' && i < 200; i++) {
+					for (i = 0; p[i] != '\0' && i < LOOP_MAX; i++) {
 						failure("i=%d, p[i]='%c' 'a'+(i%%26)='%c'", i, p[i], 'a' + (i % 26));
 						assertEqualInt(p[i], 'a' + (i % 26));
 					}