From owner-svn-src-user@FreeBSD.ORG  Mon Jul  8 11:25:05 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 36214975;
 Mon,  8 Jul 2013 11:25:05 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5A7281493;
 Mon,  8 Jul 2013 11:18:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r68BImfZ041687;
 Mon, 8 Jul 2013 11:18:48 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r68BImnq041686;
 Mon, 8 Jul 2013 11:18:48 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201307081118.r68BImnq041686@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Mon, 8 Jul 2013 11:18:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253029 - user/pho/stress2/testcases/fts
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2013 11:25:05 -0000

Author: pho
Date: Mon Jul  8 11:18:47 2013
New Revision: 253029
URL: http://svnweb.freebsd.org/changeset/base/253029

Log:
  ftsoptions needs to be non zero, move printing of file names to a higher
  verbose level and ignore fts_read(3) errors.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/testcases/fts/fts.c

Modified: user/pho/stress2/testcases/fts/fts.c
==============================================================================
--- user/pho/stress2/testcases/fts/fts.c	Mon Jul  8 06:12:38 2013	(r253028)
+++ user/pho/stress2/testcases/fts/fts.c	Mon Jul  8 11:18:47 2013	(r253029)
@@ -63,7 +63,7 @@ test(void)
 	int		ftsoptions;
 	char 		*args[2];
 
-	ftsoptions = 0;
+	ftsoptions = FTS_LOGICAL;
 	args[0] = ".";
 	args[1] = 0;
 
@@ -71,7 +71,7 @@ test(void)
 		err(1, "fts_open");
 
 	while ((p = fts_read(fts)) != NULL && done_testing == 0) {
-		if (op->verbose > 1)
+		if (op->verbose > 2)
 			(void) printf("%s\n", p->fts_path);
 		switch (p->fts_info) {
 			case FTS_F:			/* Ignore. */
@@ -84,6 +84,8 @@ test(void)
 				break;
 			case FTS_SL:			/* Ignore. */
 				break;
+			case FTS_SLNONE:		/* Ignore. */
+				break;
 			case FTS_DNR:			/* Warn, continue. */
 			case FTS_ERR:
 			case FTS_NS:
@@ -97,8 +99,6 @@ test(void)
 		}
 	}
 
-	if (errno != 0 && errno != ENOENT)
-		err(1, "fts_read");
 	if (fts_close(fts) == -1)
 		err(1, "fts_close()");