From owner-svn-src-user@freebsd.org  Sat Sep 23 11:07:22 2017
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 4F8B6E02627
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sat, 23 Sep 2017 11:07:22 +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 1D7FE6F9DC;
 Sat, 23 Sep 2017 11:07:22 +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 v8NB7Lfb095743;
 Sat, 23 Sep 2017 11:07:21 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8NB7L30095742;
 Sat, 23 Sep 2017 11:07:21 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709231107.v8NB7L30095742@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: Sat, 23 Sep 2017 11:07:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323947 - user/pho/stress2/misc
X-SVN-Group: user
X-SVN-Commit-Author: pho
X-SVN-Commit-Paths: user/pho/stress2/misc
X-SVN-Commit-Revision: 323947
X-SVN-Commit-Repository: base
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.23
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: Sat, 23 Sep 2017 11:07:22 -0000

Author: pho
Date: Sat Sep 23 11:07:21 2017
New Revision: 323947
URL: https://svnweb.freebsd.org/changeset/base/323947

Log:
  Limit runtime and return fsck status.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: user/pho/stress2/misc/trim4.sh
==============================================================================
--- user/pho/stress2/misc/trim4.sh	Sat Sep 23 08:26:42 2017	(r323946)
+++ user/pho/stress2/misc/trim4.sh	Sat Sep 23 11:07:21 2017	(r323947)
@@ -41,7 +41,8 @@ mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $m
 size="1g"
 [ $# -eq 0 ] && trim=-t
 [ "$newfs_flags" = "-U" ] && flag="-j"
-for i in `jot 6`; do
+start=`date +%s`
+while [ $((`date +%s` - start)) -lt $((15 * 60)) ]; do
 	echo "Test #$i `date '+%T'`"
 	echo "mdconfig -a -t swap -s $size -u $mdstart"
 	mdconfig -a -t swap -s $size -u $mdstart || exit 1
@@ -61,6 +62,7 @@ for i in `jot 6`; do
 	while mount | grep $mntpoint | grep -q /dev/md; do
 		umount $mntpoint || sleep 1
 	done
-	checkfs /dev/md${mdstart}$part
+	checkfs /dev/md${mdstart}$part; s=$?
 	mdconfig -d -u $mdstart
 done
+exit $?