svn commit: r213450 - projects/stress2/misc

[Peter Holm]

Author: pho
Date: Tue Oct  5 09:20:46 2010
New Revision: 213450
URL: http://svn.freebsd.org/changeset/base/213450

Log:
  Bring this scenario in line with the other SUJ tests.

Modified:
  projects/stress2/misc/suj.sh

Modified: projects/stress2/misc/suj.sh
==============================================================================
--- projects/stress2/misc/suj.sh	Tue Oct  5 09:19:59 2010	(r213449)
+++ projects/stress2/misc/suj.sh	Tue Oct  5 09:20:46 2010	(r213450)
@@ -34,16 +34,18 @@
 
 . ../default.cfg
 
-mount | grep $mntpoint | grep -q /dev/md && umount $mntpoint
+mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
+mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 mdconfig -a -t swap -s 1g -u $mdstart
 bsdlabel -w md$mdstart auto
 newfs -U md${mdstart}$part > /dev/null
 tunefs -j enable /dev/md${mdstart}$part
 mount /dev/md${mdstart}$part $mntpoint
+chmod 777 $mntpoint
 
 export RUNDIR=$mntpoint/stressX
 export runRUNTIME=20m
-(cd ..; ./run.sh rw.cfg)
+su $testuser -c "cd ..; ./run.sh rw.cfg"
 
 while mount | grep $mntpoint | grep -q /dev/md; do
 	umount $mntpoint || sleep 1