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

[Peter Holm]

Author: pho
Date: Sun Feb 22 17:50:19 2015
New Revision: 279169
URL: https://svnweb.freebsd.org/changeset/base/279169

Log:
  Use $mntpoint as mount point.
  
  Sponsored by:	 EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/nullfs3.sh
  user/pho/stress2/misc/nullfs5.sh
  user/pho/stress2/misc/union.sh

Modified: user/pho/stress2/misc/nullfs3.sh
==============================================================================
--- user/pho/stress2/misc/nullfs3.sh	Sun Feb 22 17:48:48 2015	(r279168)
+++ user/pho/stress2/misc/nullfs3.sh	Sun Feb 22 17:50:19 2015	(r279169)
@@ -36,20 +36,17 @@
 
 . ../default.cfg
 
-[ -d mp1 ] || mkdir mp1
-[ -d $RUNDIR ] || mkdir $RUNDIR
+[ -d $RUNDIR/stressX ] || mkdir -p $RUNDIR/stressX
 
-mp=`pwd`/mp1
+mp=$mntpoint
 mount | grep -q $mp && umount -f $mp
 
 mount -t nullfs `dirname $RUNDIR` $mp
 
 cd $mp/stressX
-whereis something
+whereis something > /dev/null
 cd /
 
 umount $mp
 
 mount | grep -q $mp && umount -f $mp
-
-rm -rf $mp

Modified: user/pho/stress2/misc/nullfs5.sh
==============================================================================
--- user/pho/stress2/misc/nullfs5.sh	Sun Feb 22 17:48:48 2015	(r279168)
+++ user/pho/stress2/misc/nullfs5.sh	Sun Feb 22 17:50:19 2015	(r279169)
@@ -50,22 +50,17 @@ for j in `jot 5`; do
 	/tmp/kinfo &
 done
 
-[ -d mp1 ] || mkdir mp1
+mount | grep -q $mntpoint && umount -f $mntpoint
 
-mp=`pwd`/mp1
-mount | grep -q $mp && umount -f $mp
+mount -t nullfs `dirname $RUNDIR` $mntpoint
 
-mount -t nullfs `dirname $RUNDIR` $mp
-
-export RUNDIR=`pwd`/mp1/stressX
+export RUNDIR=$mntpoint/stressX
 export runRUNTIME=10m
 (cd ..; ./run.sh marcus.cfg)
 
-umount $mp 2>&1 | grep -v busy
-
-mount | grep -q $mp && umount -f $mp
+umount $mntpoint 2>&1 | grep -v busy
 
-rm -rf mp1
+mount | grep -q $mntpoint && umount -f $mntpoint
 
 for j in `jot 5`; do
 	wait

Modified: user/pho/stress2/misc/union.sh
==============================================================================
--- user/pho/stress2/misc/union.sh	Sun Feb 22 17:48:48 2015	(r279168)
+++ user/pho/stress2/misc/union.sh	Sun Feb 22 17:50:19 2015	(r279169)
@@ -36,7 +36,6 @@
 
 u1=$mdstart
 u2=$((u1 + 1))
-[ -d mp1 ] || mkdir mp1
 
 mount | grep -q /dev/md${u2}$part && umount -f /dev/md${u2}$part
 mount | grep -q /dev/md${u1}$part && umount -f /dev/md${u1}$part
@@ -51,12 +50,12 @@ mdconfig -s 256m -u $u2
 bsdlabel -w md$u2 auto
 newfs md${u2}${part} > /dev/null
 
-mount -o ro    /dev/md${u1}$part mp1
-mount -o union /dev/md${u2}$part mp1 
+mount -o ro    /dev/md${u1}$part $mntpoint
+mount -o union /dev/md${u2}$part $mntpoint
 
-export RUNDIR=`pwd`/mp1/stressX
+export RUNDIR=$mntpoint/stressX
 export runRUNTIME=10m
-(cd ..; ./run.sh marcus.cfg) 
+(cd ..; ./run.sh marcus.cfg) > /dev/null
 
 umount /dev/md${u2}$part
 umount /dev/md${u1}$part
@@ -66,5 +65,3 @@ mount | grep -q /dev/md${u1}$part && umo
 
 mdconfig -d -u $u2
 mdconfig -d -u $u1
-
-rm -rf mp1