From owner-svn-src-user@freebsd.org  Mon Oct  2 06:48:57 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 AE769E37ED0
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon,  2 Oct 2017 06:48:57 +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 78AD9817F7;
 Mon,  2 Oct 2017 06:48:57 +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 v926musP085007;
 Mon, 2 Oct 2017 06:48:56 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v926muvH085006;
 Mon, 2 Oct 2017 06:48:56 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201710020648.v926muvH085006@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: Mon, 2 Oct 2017 06:48:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r324188 - 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: 324188
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: Mon, 02 Oct 2017 06:48:57 -0000

Author: pho
Date: Mon Oct  2 06:48:56 2017
New Revision: 324188
URL: https://svnweb.freebsd.org/changeset/base/324188

Log:
  Fix typo in the exit statement noted by jilles@
  Add note that not breaking out on fsck failure is on purpose.
  Remove reference to now unused $i.
  
  Reported by:	jilles@
  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	Mon Oct  2 06:05:19 2017	(r324187)
+++ user/pho/stress2/misc/trim4.sh	Mon Oct  2 06:48:56 2017	(r324188)
@@ -41,9 +41,10 @@ mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $m
 size="1g"
 [ $# -eq 0 ] && trim=-t
 [ "$newfs_flags" = "-U" ] && flag="-j"
+s=0
 start=`date +%s`
 while [ $((`date +%s` - start)) -lt $((15 * 60)) ]; do
-	echo "Test #$i `date '+%T'`"
+	echo "Test `date '+%T'`"
 	echo "mdconfig -a -t swap -s $size -u $mdstart"
 	mdconfig -a -t swap -s $size -u $mdstart || exit 1
 	bsdlabel -w md$mdstart auto
@@ -62,7 +63,8 @@ while [ $((`date +%s` - start)) -lt $((15 * 60)) ]; do
 	while mount | grep $mntpoint | grep -q /dev/md; do
 		umount $mntpoint || sleep 1
 	done
-	checkfs /dev/md${mdstart}$part; s=$?
+#	Do not break in case of fsck error
+	checkfs /dev/md${mdstart}$part || s=$?
 	mdconfig -d -u $mdstart
 done
-exit $?
+exit $s