From owner-svn-src-user@freebsd.org  Mon Sep 25 11:38:59 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 D80CBE1158C
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 25 Sep 2017 11:38:59 +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 9E535773D8;
 Mon, 25 Sep 2017 11:38:59 +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 v8PBcww6016600;
 Mon, 25 Sep 2017 11:38:58 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8PBcw2e016597;
 Mon, 25 Sep 2017 11:38:58 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201709251138.v8PBcw2e016597@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, 25 Sep 2017 11:38:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r323984 - 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: 323984
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, 25 Sep 2017 11:39:00 -0000

Author: pho
Date: Mon Sep 25 11:38:58 2017
New Revision: 323984
URL: https://svnweb.freebsd.org/changeset/base/323984

Log:
  Return fsck(1) status.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/trim.sh
  user/pho/stress2/misc/trim2.sh
  user/pho/stress2/misc/trim3.sh

Modified: user/pho/stress2/misc/trim.sh
==============================================================================
--- user/pho/stress2/misc/trim.sh	Mon Sep 25 02:06:51 2017	(r323983)
+++ user/pho/stress2/misc/trim.sh	Mon Sep 25 11:38:58 2017	(r323984)
@@ -64,9 +64,8 @@ for flag in ' ' $opt; do
 		umount $mntpoint && break || sleep 10
 	done
 	[ $i -eq 6 ] && { s=1; break; }
-	checkfs /dev/md${mdstart}$part
+	checkfs /dev/md${mdstart}$part || s=1
 	mdconfig -d -u $mdstart
 done
-rm -f /tmp/fsck.log
 [ $malloc_wait != 1 ] && sysctl vm.md_malloc_wait=$malloc_wait
 exit $s

Modified: user/pho/stress2/misc/trim2.sh
==============================================================================
--- user/pho/stress2/misc/trim2.sh	Mon Sep 25 02:06:51 2017	(r323983)
+++ user/pho/stress2/misc/trim2.sh	Mon Sep 25 11:38:58 2017	(r323984)
@@ -54,10 +54,8 @@ while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
 
-grep -a -qm1 Trim /dev/md${mdstart}$part && echo "Test failed"
+grep -a -qm1 Trim /dev/md${mdstart}$part && { echo "Test failed"; s=1; }
 
-fsck -t ufs -y /dev/md${mdstart}$part 2>&1 | tee /tmp/fsck.log | \
-     grep -v "IS CLEAN" | egrep -q  -m1 "[A-Z][A-Z]" && \
-     cat /tmp/fsck.log
+checkfs /dev/md${mdstart}$part; s=$?
 mdconfig -d -u $mdstart
-rm -f /tmp/fsck.log
+exit $s

Modified: user/pho/stress2/misc/trim3.sh
==============================================================================
--- user/pho/stress2/misc/trim3.sh	Mon Sep 25 02:06:51 2017	(r323983)
+++ user/pho/stress2/misc/trim3.sh	Mon Sep 25 11:38:58 2017	(r323984)
@@ -62,6 +62,7 @@ for flag in ' ' $opt; 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 $s