From owner-svn-src-user@freebsd.org  Mon May  1 07:52:23 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 D36D9D5AB2F
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon,  1 May 2017 07:52:23 +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 B0B4F838;
 Mon,  1 May 2017 07:52:23 +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 v417qMtR033108;
 Mon, 1 May 2017 07:52:22 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v417qMnR033106;
 Mon, 1 May 2017 07:52:22 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705010752.v417qMnR033106@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, 1 May 2017 07:52:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r317640 - 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.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, 01 May 2017 07:52:23 -0000

Author: pho
Date: Mon May  1 07:52:22 2017
New Revision: 317640
URL: https://svnweb.freebsd.org/changeset/base/317640

Log:
  Style and fix test termination.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/nfs5.sh
  user/pho/stress2/misc/nfs6.sh

Modified: user/pho/stress2/misc/nfs5.sh
==============================================================================
--- user/pho/stress2/misc/nfs5.sh	Mon May  1 07:49:41 2017	(r317639)
+++ user/pho/stress2/misc/nfs5.sh	Mon May  1 07:52:22 2017	(r317640)
@@ -36,22 +36,23 @@ D=$diskimage
 dede $D 1m 128 || exit
 
 mount | grep "${mntpoint}2" | grep nfs > /dev/null && umount -f ${mntpoint}2
-mount | grep "$mntpoint"    | grep /md > /dev/null && umount -f ${mntpoint}
-mdconfig -l | grep -q ${mdstart}  &&  mdconfig -d -u $mdstart
+mount | grep "$mntpoint"    | grep /md > /dev/null && umount -f $mntpoint
+mdconfig -l | grep -q $mdstart  &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t vnode -f $D -u $mdstart
 
-bsdlabel -w md${mdstart} auto
-newfs $newfs_flags md${mdstart}${part} > /dev/null
-mount /dev/md${mdstart}${part} $mntpoint
+bsdlabel -w md$mdstart auto
+newfs $newfs_flags md${mdstart}$part > /dev/null
+mount /dev/md${mdstart}$part $mntpoint
 
-mkdir ${mntpoint}/stressX
-chmod 777 ${mntpoint}/stressX
+mkdir $mntpoint/stressX
+chmod 777 $mntpoint/stressX
 
 [ ! -d ${mntpoint}2 ] &&  mkdir ${mntpoint}2
 chmod 777 ${mntpoint}2
 
-mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw 127.0.0.1:/$mntpoint ${mntpoint}2
+mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw 127.0.0.1:$mntpoint \
+    ${mntpoint}2
 
 export RUNDIR=${mntpoint}2/stressX
 export runRUNTIME=4m
@@ -63,5 +64,7 @@ umount -f ${mntpoint}2 > /dev/null 2>&1
 
 mdconfig -d -u $mdstart
 rm -f $D
-kill `ps | grep run.sh | grep -v grep | awk '{print $1}'`
+kill $!
+../tools/killall.sh
 wait
+exit 0

Modified: user/pho/stress2/misc/nfs6.sh
==============================================================================
--- user/pho/stress2/misc/nfs6.sh	Mon May  1 07:49:41 2017	(r317639)
+++ user/pho/stress2/misc/nfs6.sh	Mon May  1 07:52:22 2017	(r317640)
@@ -42,22 +42,23 @@ D=$diskimage
 dede $D 1m 128 || exit
 
 mount | grep "${mntpoint}2" | grep nfs > /dev/null && umount -f ${mntpoint}2
-mount | grep "$mntpoint"    | grep /md > /dev/null && umount -f ${mntpoint}
-mdconfig -l | grep -q ${mdstart}  &&  mdconfig -d -u $mdstart
+mount | grep "$mntpoint"    | grep /md > /dev/null && umount -f $mntpoint
+mdconfig -l | grep -q $mdstart  &&  mdconfig -d -u $mdstart
 
 mdconfig -a -t vnode -f $D -u $mdstart
 
-bsdlabel -w md${mdstart} auto
-newfs $newfs_flags md${mdstart}${part} > /dev/null
-mount /dev/md${mdstart}${part} $mntpoint
+bsdlabel -w md$mdstart auto
+newfs $newfs_flags md${mdstart}$part > /dev/null
+mount /dev/md${mdstart}$part $mntpoint
 
-mkdir ${mntpoint}/stressX
-chmod 777 ${mntpoint}/stressX
+mkdir $mntpoint/stressX
+chmod 777 $mntpoint/stressX
 
 [ ! -d ${mntpoint}2 ] &&  mkdir ${mntpoint}2
 chmod 777 ${mntpoint}2
 
-mount -t nfs -o tcp -o retrycnt=3 -o intr -o soft -o rw 127.0.0.1:$mntpoint ${mntpoint}2
+mount -t nfs -o tcp -o retrycnt=3 -o intr,soft -o rw 127.0.0.1:$mntpoint \
+    ${mntpoint}2
 
 export RUNDIR=${mntpoint}2/stressX
 export runRUNTIME=4m
@@ -67,7 +68,7 @@ sleep 60
 for i in `jot 10`; do
 	umount -f $mntpoint    > /dev/null 2>&1
 	sleep 1
-	mount /dev/md${mdstart}${part} $mntpoint
+	mount /dev/md${mdstart}$part $mntpoint
 	sleep 1
 done
 
@@ -76,5 +77,7 @@ umount -f ${mntpoint}2 > /dev/null 2>&1
 
 mdconfig -d -u $mdstart
 rm -f $D
-kill `ps | grep run.sh | grep -v grep | awk '{print $1}'`
+kill $!
+../tools/killall.sh
 wait
+exit 0