From owner-svn-src-user@freebsd.org  Wed Dec  9 13:45:52 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 719339D45B9
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Wed,  9 Dec 2015 13:45:52 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 42C231451;
 Wed,  9 Dec 2015 13:45:52 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB9DjplY087646;
 Wed, 9 Dec 2015 13:45:51 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB9Djpms087645;
 Wed, 9 Dec 2015 13:45:51 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201512091345.tB9Djpms087645@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 9 Dec 2015 13:45:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r292018 - 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.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Dec 2015 13:45:52 -0000

Author: pho
Date: Wed Dec  9 13:45:51 2015
New Revision: 292018
URL: https://svnweb.freebsd.org/changeset/base/292018

Log:
  Added timeout to test.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/fcntl.sh

Modified: user/pho/stress2/misc/fcntl.sh
==============================================================================
--- user/pho/stress2/misc/fcntl.sh	Wed Dec  9 12:25:03 2015	(r292017)
+++ user/pho/stress2/misc/fcntl.sh	Wed Dec  9 13:45:51 2015	(r292018)
@@ -38,8 +38,7 @@ sed '1,/^EOF/d' < $here/$0 > fcntl.c
 mycc -o fcntl -Wall -Wextra -O0 -g fcntl.c || exit 1
 rm -f fcntl.c
 
-/tmp/fcntl
-status=$?
+/tmp/fcntl || { status=$?; echo FAIL; }
 
 rm -f /tmp/fcntl
 exit $status
@@ -63,6 +62,13 @@ const char name[] = "work";
 int fd;
 
 static void
+ahandler(int s __unused)
+{
+	unlink(name);
+	_exit(1);
+}
+
+static void
 handler(int s __unused)
 {
 	completed++;
@@ -176,6 +182,8 @@ main(void)
 	off_t len;
 
 	signal(SIGHUP, handler);
+	signal(SIGALRM, ahandler);
+	alarm(300);
 	if ((fd = open(name, O_RDWR | O_CREAT | O_TRUNC, 0640)) == -1)
 		err(1, "open(%s)", name);
 	len = N * sizeof(val);