From owner-svn-src-user@FreeBSD.ORG  Fri Dec  6 09:22:32 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6437736D;
 Fri,  6 Dec 2013 09:22:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 507DD1C87;
 Fri,  6 Dec 2013 09:22:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB69MWYD086384;
 Fri, 6 Dec 2013 09:22:32 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB69MVFe086382;
 Fri, 6 Dec 2013 09:22:31 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312060922.rB69MVFe086382@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Fri, 6 Dec 2013 09:22:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259024 - user/pho/stress2/misc
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.17
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: Fri, 06 Dec 2013 09:22:32 -0000

Author: pho
Date: Fri Dec  6 09:22:31 2013
New Revision: 259024
URL: http://svnweb.freebsd.org/changeset/base/259024

Log:
  Added timeout for tests.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/namecache.sh
  user/pho/stress2/misc/namecache2.sh

Modified: user/pho/stress2/misc/namecache.sh
==============================================================================
--- user/pho/stress2/misc/namecache.sh	Fri Dec  6 08:42:41 2013	(r259023)
+++ user/pho/stress2/misc/namecache.sh	Fri Dec  6 09:22:31 2013	(r259024)
@@ -74,6 +74,7 @@ dir=/tmp
 [ -d $dir ] || mkdir -p $dir
 cd $dir
 
+start=`date '+%s'`
 for i in `jot 30`; do
 	for j in `jot 10`; do
 		/tmp/namecache &
@@ -82,6 +83,7 @@ for i in `jot 30`; do
 	for j in `jot 10`; do
 		wait
 	done
+	[ $((`date '+%s'` - start)) -gt 1800 ] && break
 done
 
 if ls -l ${dir}/file.0* 2>&1 | egrep "file.0[0-9]" | grep -q "No such file"; then

Modified: user/pho/stress2/misc/namecache2.sh
==============================================================================
--- user/pho/stress2/misc/namecache2.sh	Fri Dec  6 08:42:41 2013	(r259023)
+++ user/pho/stress2/misc/namecache2.sh	Fri Dec  6 09:22:31 2013	(r259024)
@@ -137,6 +137,7 @@ main(void)
 	int result, fd;
 	unsigned int number;
 	struct timespec	period;
+	time_t start;
 
 	sprintf(filename1, "tfa0");
 	fd = open(filename1, O_CREAT, S_IRWXU);
@@ -152,6 +153,7 @@ main(void)
 	if (result < 0)
 		err(1, "pthread_create(): %s\n", strerror(result));
 
+	start = time(NULL);
 	for (number = 0; number < 0x001FFFFF; number += 2) {
 		sprintf(filename1, "tfa%u", number);
 		sprintf(filename2, "tfa%u", number + 1);
@@ -181,6 +183,10 @@ main(void)
 			nanosleep(&period, 0);
 			return 0;
 		}
+		if (time(NULL) - start > 600) {
+			fprintf(stderr, "Test timed out.\n");
+			break;
+		}
 	}
 	unlink(filename3);