From: David Disseldorp <ddiss@sgi.com>
Date: Mon, 16 Oct 2006 15:46:05 +0000 (+0000)
Subject: run test on scratch dir
X-Git-Tag: v1.1.0~566
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e730a1b8a0c0be75450cd7e662346435eb3c633;p=xfstests-dev.git

run test on scratch dir
remove failure case for when scratch is not mounted before test
Merge of master-melb:xfs-cmds:27201a by kenmcd.
---

diff --git a/135 b/135
index d584dc67..c8f73847 100755
--- a/135
+++ b/135
@@ -32,16 +32,25 @@ _supported_fs xfs
 _supported_os Linux IRIX
 
 _setup_testdir
+_require_scratch
+_scratch_mkfs_xfs >/dev/null 2>&1
 
 _umount_mount()
 {
     CWD=`pwd`
     cd /
-    umount $SCRATCH_MNT
+    # pipe error into /dev/null, in case not mounted (after _require_scratch)
+    umount $SCRATCH_MNT 2>/dev/null
     _scratch_mount
     cd "$CWD"
 }
 
+
+
+_umount_mount
+
+cd $SCRATCH_MNT
+
 # create file with async I/O
 xfs_io -f -c 'pwrite -b 4k -S 0x12 0 4k' async_file > /dev/null