From owner-svn-src-user@freebsd.org  Fri Apr 28 12:05:08 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 6E22AD547A8
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 28 Apr 2017 12:05:08 +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 408E61832;
 Fri, 28 Apr 2017 12:05:08 +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 v3SC57Qr034058;
 Fri, 28 Apr 2017 12:05:07 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3SC57el034055;
 Fri, 28 Apr 2017 12:05:07 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201704281205.v3SC57el034055@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: Fri, 28 Apr 2017 12:05:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r317548 - 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: Fri, 28 Apr 2017 12:05:08 -0000

Author: pho
Date: Fri Apr 28 12:05:06 2017
New Revision: 317548
URL: https://svnweb.freebsd.org/changeset/base/317548

Log:
  Do not hard code mount points.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/nullfs10.sh
  user/pho/stress2/misc/nullfs11.sh
  user/pho/stress2/misc/nullfs9.sh

Modified: user/pho/stress2/misc/nullfs10.sh
==============================================================================
--- user/pho/stress2/misc/nullfs10.sh	Fri Apr 28 11:00:58 2017	(r317547)
+++ user/pho/stress2/misc/nullfs10.sh	Fri Apr 28 12:05:06 2017	(r317548)
@@ -40,7 +40,7 @@
 
 . ../default.cfg
 
-mnt2=/mnt2
+mnt2=${mntpoint}2
 mount | grep -q $mnt2 && umount $mnt2
 
 [ -d $mnt2 ] || mkdir $mnt2
@@ -61,6 +61,7 @@ sleep .5
 # This line should cause a "/mnt2/ls: Text file busy"
 $mnt2/ls -l /bin/ls $mntpoint $mnt2 && echo FAIL || echo OK
 kill $!
+wait
 
 while mount | grep -q "$mnt2 "; do
 	umount $mnt2 || sleep 1

Modified: user/pho/stress2/misc/nullfs11.sh
==============================================================================
--- user/pho/stress2/misc/nullfs11.sh	Fri Apr 28 11:00:58 2017	(r317547)
+++ user/pho/stress2/misc/nullfs11.sh	Fri Apr 28 12:05:06 2017	(r317548)
@@ -43,8 +43,8 @@ fi
 export LANG=C
 CACHE=nullfs11-cache.log
 NOCACHE=nullfs11-nocache.log
-mp1=/mnt
-mp2=/mnt2
+mp1=$mntpoint
+mp2=${mntpoint}2
 [ -d $mp2 ] || mkdir $mp2
 rm -f $CACHE $NOCACHE
 

Modified: user/pho/stress2/misc/nullfs9.sh
==============================================================================
--- user/pho/stress2/misc/nullfs9.sh	Fri Apr 28 11:00:58 2017	(r317547)
+++ user/pho/stress2/misc/nullfs9.sh	Fri Apr 28 12:05:06 2017	(r317548)
@@ -36,7 +36,7 @@
 
 . ../default.cfg
 
-mnt2=/mnt2
+mnt2=${mntpoint}2
 mount | grep -q $mnt2/mp && umount $mnt2/mp
 
 [ -d $mnt2 ] || mkdir $mnt2