svn commit: r317548 - user/pho/stress2/misc

[Peter Holm]

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