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

[Peter Holm]

Author: pho
Date: Tue Jul 30 06:39:00 2013
New Revision: 253792
URL: http://svnweb.freebsd.org/changeset/base/253792

Log:
  Test scripts that make assumptions about mount points.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/snap2-1.sh
  user/pho/stress2/misc/snap2.sh
  user/pho/stress2/misc/snap3.sh
  user/pho/stress2/misc/snap4.sh
  user/pho/stress2/misc/snap5-1.sh
  user/pho/stress2/misc/snap5.sh
  user/pho/stress2/misc/snap6.sh
  user/pho/stress2/misc/snap7.sh

Modified: user/pho/stress2/misc/snap2-1.sh
==============================================================================
--- user/pho/stress2/misc/snap2-1.sh	Tue Jul 30 06:37:10 2013	(r253791)
+++ user/pho/stress2/misc/snap2-1.sh	Tue Jul 30 06:39:00 2013	(r253792)
@@ -42,6 +42,7 @@
 # --- trap 0xc, eip = 0xc060bcfb, esp = 0xe76728f8, ebp = 0xe767291c ---
 # g_io_request(c53ff7bc,c5051d40,d8c72408,c54ca110,e7672950) at g_io_request+0x5f
 
+mount | grep -q "on /tmp " || exit 0
 rm -f /tmp/.snap/pho
 [ -d /tmp/.snap ] || mkdir /tmp/.snap
 trap "rm -f /tmp/.snap/pho" 0

Modified: user/pho/stress2/misc/snap2.sh
==============================================================================
--- user/pho/stress2/misc/snap2.sh	Tue Jul 30 06:37:10 2013	(r253791)
+++ user/pho/stress2/misc/snap2.sh	Tue Jul 30 06:39:00 2013	(r253792)
@@ -42,6 +42,7 @@
 
 . ../default.cfg
 
+mount | grep -q "on /tmp " || exit 0
 rm -f /tmp/.snap/pho
 trap "rm -f /tmp/.snap/pho" 0
 mount | grep "${mntpoint}" | grep -q md${mdstart} && umount -f ${mntpoint}

Modified: user/pho/stress2/misc/snap3.sh
==============================================================================
--- user/pho/stress2/misc/snap3.sh	Tue Jul 30 06:37:10 2013	(r253791)
+++ user/pho/stress2/misc/snap3.sh	Tue Jul 30 06:39:00 2013	(r253792)
@@ -35,7 +35,7 @@
 # Test with two snapshots
 # 20070506 Page fault in g_io_request+0x7f
 
-mount | grep -q /tmp || exit 1 # /tmp must be a mount point for this test
+mount | grep -q "on /tmp " || exit 0
 rm -f /tmp/.snap/pho.1
 rm -f /tmp/.snap/pho.2
 trap "rm -f /tmp/.snap/pho.?" 0

Modified: user/pho/stress2/misc/snap4.sh
==============================================================================
--- user/pho/stress2/misc/snap4.sh	Tue Jul 30 06:37:10 2013	(r253791)
+++ user/pho/stress2/misc/snap4.sh	Tue Jul 30 06:39:00 2013	(r253792)
@@ -34,6 +34,7 @@
 
 . ../default.cfg
 
+mount | grep -q "on /tmp " || exit 0
 mount | grep -q "/dev/md$mdstart on $mntpoint" && umount $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 rm -f /tmp/.snap/pho

Modified: user/pho/stress2/misc/snap5-1.sh
==============================================================================
--- user/pho/stress2/misc/snap5-1.sh	Tue Jul 30 06:37:10 2013	(r253791)
+++ user/pho/stress2/misc/snap5-1.sh	Tue Jul 30 06:39:00 2013	(r253792)
@@ -32,6 +32,7 @@
 
 . ../default.cfg
 
+mount | grep -q "on /tmp " || exit 0
 mnt2=${mntpoint}2
 [ ! -d $mnt2 ] && mkdir $mnt2
 

Modified: user/pho/stress2/misc/snap5.sh
==============================================================================
--- user/pho/stress2/misc/snap5.sh	Tue Jul 30 06:37:10 2013	(r253791)
+++ user/pho/stress2/misc/snap5.sh	Tue Jul 30 06:39:00 2013	(r253792)
@@ -32,7 +32,7 @@
 
 . ../default.cfg
 
-mount | grep -q /tmp || exit 1 # /tmp must be a mount point for this test
+mount | grep -q "on /tmp " || exit 0
 mnt2=${mntpoint}2
 [ ! -d $mnt2 ] && mkdir $mnt2
 mount | grep -q "/dev/md$mdstart on $mnt2" && umount $mnt2

Modified: user/pho/stress2/misc/snap6.sh
==============================================================================
--- user/pho/stress2/misc/snap6.sh	Tue Jul 30 06:37:10 2013	(r253791)
+++ user/pho/stress2/misc/snap6.sh	Tue Jul 30 06:39:00 2013	(r253792)
@@ -25,6 +25,7 @@
 
 root=/var
 
+mount | grep -q "on /var " || exit 0
 rm -f $root/.snap/pho $root/big $root/big2
 trap "rm -f $root/.snap/pho $root/big $root/big2" 0
 free=`df $root | tail -1 | awk '{print $4}'`

Modified: user/pho/stress2/misc/snap7.sh
==============================================================================
--- user/pho/stress2/misc/snap7.sh	Tue Jul 30 06:37:10 2013	(r253791)
+++ user/pho/stress2/misc/snap7.sh	Tue Jul 30 06:39:00 2013	(r253792)
@@ -35,6 +35,7 @@
 # Test with unmount and paralless access to mountpoint
 # 20070508 page fault in g_io_request+0xa6
 
+mount | grep -q "on /tmp " || exit 0
 mount | grep -q "/dev/md$mdstart on $mntpoint" && umount $mntpoint
 rm -f /tmp/.snap/pho.1
 trap "rm -f /tmp/.snap/pho.1" 0