X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=soak;h=ec4fbb53ba1b23dfa7ef7efe7407ff5453454361;hp=c6a203a5140e677f1bb7435e40fba60a8b6607c2;hb=30daf6bd5fa68a265e1e8618e3c8909b812eb3ce;hpb=27fba05e66981c239c3be7a7e5a3aa0d8dc59247;ds=sidebyside

diff --git a/soak b/soak
index c6a203a5..ec4fbb53 100755
--- a/soak
+++ b/soak
@@ -1,42 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 #-----------------------------------------------------------------------
-# Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of version 2 of the GNU General Public License as
+# Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
 # published by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# 
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like.  Any license provided herein, whether implied or
-# otherwise, applies only to this software file.  Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write the Free Software Foundation, Inc., 59
-# Temple Place - Suite 330, Boston MA 02111-1307, USA.
-# 
-# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
-# Mountain View, CA  94043, or:
-# 
-# http://www.sgi.com 
-# 
-# For further information regarding this notice, see: 
-# 
-# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
 #-----------------------------------------------------------------------
 #
-# creator
-owner=dxm@sgi.com
 
 # get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter
 
 tmp=/tmp/$$
 seq=soak
@@ -45,7 +29,7 @@ status=1	# failure is the default!
 _cleanup()
 {
     echo "        *** umount"
-    umount $SCRATCH_DEV >/dev/null 2>&1
+    _scratch_unmount >/dev/null 2>&1
 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -101,11 +85,11 @@ _log "***     (`date`)"
 _log "    *** init"
 _log "        *** unmounting scratch device"
 
-umount $SCRATCH_DEV 2>&1 |  _fix_malloc >>$FULL
+_scratch_unmount 2>&1 |  _fix_malloc >>$FULL
 
 _log "        *** clean scratch device"
 
-mkfs -t xfs -f $SCRATCH_DEV 2>&1 |  _fix_malloc >>$FULL \
+mkfs_xfs -f $SCRATCH_DEV 2>&1 |  _fix_malloc >>$FULL \
                         || _fail "            !!! failed to mkfs SCRATCH_DEV"
 
 pass=1
@@ -115,11 +99,11 @@ do
     _log "    *** pass $pass (`date`)"
     
     _log "        *** check"
-    _check_fs $SCRATCH_DEV
+    _check_scratch_fs
     
     _log "        *** mounting scratch device"
 
-    if ! mount -t xfs $SCRATCH_DEV $SCRATCH_MNT 2>&1 | _logp
+    if ! _scratch_mount 2>&1 | _logp
     then
         _fail "            !!! failed to mount"
     fi
@@ -131,7 +115,7 @@ do
                         || _fail "            !!! couldn't delete old dir"
 
         _log "        *** check"
-        _check_fs $SCRATCH_DEV
+        _check_scratch_fs
     fi
 
     _log "        *** mkdir"
@@ -139,12 +123,12 @@ do
                         || _fail "            !!! couldn't delete old dir"
     
     _log "        *** stress"
-    src/fsstress -d $SCRATCH_MNT/soak_test -p $proc -n $stress $FSSTRESS_AVOID 2>&1 | \
+    ltp/fsstress -d $SCRATCH_MNT/soak_test -p $proc -n $stress $FSSTRESS_AVOID 2>&1 | \
         _fix_malloc >>$FULL
 
     _log "        *** unmounting scratch device"
 
-    umount $SCRATCH_DEV 2>&1 | _logp \
+    _scratch_unmount 2>&1 | _logp \
                             || _fail "            !!! failed to umount"
     
     let "pass = pass + 1"