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

[Peter Holm]

Author: pho
Date: Fri Apr 28 12:10:16 2017
New Revision: 317550
URL: https://svnweb.freebsd.org/changeset/base/317550

Log:
  Do not use hardcoded mount points.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/nullfs6.sh
  user/pho/stress2/misc/nullfs8.sh

Modified: user/pho/stress2/misc/nullfs6.sh
==============================================================================
--- user/pho/stress2/misc/nullfs6.sh	Fri Apr 28 12:07:23 2017	(r317549)
+++ user/pho/stress2/misc/nullfs6.sh	Fri Apr 28 12:10:16 2017	(r317550)
@@ -36,16 +36,17 @@
 
 . ../default.cfg
 
-mount | grep nullfs | grep -q /tmp/1 && umount /tmp/1
+nullfs_srcdir=${nullfs_srcdir:-/tmp}
+mount | grep nullfs | grep -q $nullfs_srcdir/1 && umount $nullfs_srcdir/1
 
-rm -rf /tmp/1 /tmp/2
-mkdir /tmp/1 /tmp/2
-touch /tmp/1/test.file
+rm -rf $nullfs_srcdir/1 $nullfs_srcdir/2
+mkdir $nullfs_srcdir/1 $nullfs_srcdir/2
+touch $nullfs_srcdir/1/test.file
 
-mount -t nullfs /tmp/1 /tmp/2
+mount -t nullfs $nullfs_srcdir/1 $nullfs_srcdir/2
 
-cp /tmp/1/test.file /tmp/2/test.file	# scenario by kib
-mv /tmp/1/test.file /tmp/2/		# panics with lock violation
+cp $nullfs_srcdir/1/test.file $nullfs_srcdir/2/test.file	# scenario by kib
+mv $nullfs_srcdir/1/test.file $nullfs_srcdir/2/	# panics with lock violation
 
-umount /tmp/1
-rm -rf /tmp/1 /tmp/2
+umount $nullfs_srcdir/1
+rm -rf $nullfs_srcdir/1 $nullfs_srcdir/2

Modified: user/pho/stress2/misc/nullfs8.sh
==============================================================================
--- user/pho/stress2/misc/nullfs8.sh	Fri Apr 28 12:07:23 2017	(r317549)
+++ user/pho/stress2/misc/nullfs8.sh	Fri Apr 28 12:10:16 2017	(r317550)
@@ -36,12 +36,13 @@
 
 . ../default.cfg
 
+nullfs_srcdir=${nullfs_srcdir:-/tmp}
 opt="-o nfsv3,rw,udp,rdirplus,noauto,retrycnt=3"
 grep -q $mntpoint /etc/exports ||
     { echo "$mntpoint missing from /etc/exports"; exit 0; }
 
 mount | grep -wq $mntpoint && umount $mntpoint
-mount -t nullfs /tmp $mntpoint
+mount -t nullfs $nullfs_srcdir $mntpoint
 
 mntpoint2=${mntpoint}2
 mntpoint3=${mntpoint}3
@@ -54,11 +55,11 @@ done
 for i in `jot 50` ; do
 	su $testuser -c "cp -r /usr/include $mntpoint2/nullfs8-2 2>/dev/null" &
 	su $testuser -c "cp -r /usr/include $mntpoint3/nullfs8-2 2>/dev/null" &
-	wait;wait
+	wait
 	su $testuser -c "find $mntpoint2 > /dev/null 2>&1" &
 	su $testuser -c "find $mntpoint3 > /dev/null 2>&1" &
-	wait;wait
-	rm -rf /tmp/nullfs8-2
+	wait
+	rm -rf $nullfs_srcdir/nullfs8-2
 done
 
 for m in $mntpoint3 $mntpoint2 $mntpoint; do