xfs
[Top] [All Lists]

[PATCH 09/12] 132: use TEST_DIR instead of a SCRATCH_DEV

To: xfs@xxxxxxxxxxx
Subject: [PATCH 09/12] 132: use TEST_DIR instead of a SCRATCH_DEV
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Tue, 10 Dec 2013 23:34:54 -0800
Cc: Stanislav Kholmanskikh <stanislav.kholmanskikh@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
References: <20131211073445.353655850@xxxxxxxxxxxxxxxxxxxxxx>
User-agent: quilt/0.60-1
The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
 tests/generic/132 |   33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/tests/generic/132 b/tests/generic/132
index aa52c7d..3053e67 100755
--- a/tests/generic/132
+++ b/tests/generic/132
@@ -40,10 +40,9 @@ trap "exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux IRIX
 
-_require_scratch
-
-_scratch_mkfs >/dev/null 2>&1
-_scratch_mount
+testdir="$TEST_DIR/dir.$seq"
+rm -rf $testdir
+mkdir $testdir
 
 $XFS_IO_PROG -f -t -c "pwrite -S 0x63 0 512" \
     -c "pwrite -S 0x64 512 512" \
@@ -61,7 +60,7 @@ $XFS_IO_PROG -f -t -c "pwrite -S 0x63 0 512" \
     -c "pread -v 2560 512" \
     -c "pread -v 3072 512" \
     -c "pread -v 3584 512" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x63 4096 1024" \
     -c "pwrite -S 0x6B 5120 1024" \
@@ -75,7 +74,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x63 4096 1024" \
     -c "pread -v 5120 1024" \
     -c "pread -v 6144 1024" \
     -c "pread -v 7168 1024" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x6E 8192 2048" \
     -c "pwrite -S 0x6F 10240 2048" \
@@ -85,14 +84,14 @@ $XFS_IO_PROG -f -c "pwrite -S 0x6E 8192 2048" \
     -c "pread -v 6144 2048" \
     -c "pread -v 8192 2048" \
     -c "pread -v 10240 2048" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x70 12288 4096" \
     -c "pread -v 0 4096" \
     -c "pread -v 4096 4096" \
     -c "pread -v 8192 4096" \
     -c "pread -v 12288 4096" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x71 16384 8192" \
     -c "pwrite -S 0x72 24576 8192" \
@@ -100,7 +99,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x71 16384 8192" \
     -c "pread -v 8192 8192" \
     -c "pread -v 8192 8192" \
     -c "pread -v 16384 8192" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x73 32768 16384" \
     -c "pwrite -S 0x74 49152 16384" \
@@ -108,7 +107,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x73 32768 16384" \
     -c "pread -v 16384 16384" \
     -c "pread -v 32768 16384" \
     -c "pread -v 49152 16384" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x75 65536 32768" \
     -c "pwrite -S 0x76 98304 32768" \
@@ -116,7 +115,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x75 65536 32768" \
     -c "pread -v 32768 32768" \
     -c "pread -v 65536 32768" \
     -c "pread -v 98304 32768" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x76 131072 65536" \
     -c "pwrite -S 0x77 196608 65536" \
@@ -124,7 +123,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x76 131072 65536" \
     -c "pread -v 65536 65536" \
     -c "pread -v 131072 65536" \
     -c "pread -v 196608 65536" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x76 262144 131072" \
     -c "pwrite -S 0x77 393216 131072" \
@@ -132,14 +131,14 @@ $XFS_IO_PROG -f -c "pwrite -S 0x76 262144 131072" \
     -c "pread -v 131072 131072" \
     -c "pread -v 262144 131072" \
     -c "pread -v 393216 131072" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x76 524288 524288" \
     -c "pwrite -S 0x77 1048576 524288" \
     -c "pread -v 0 524288" \
     -c "pread -v 524288 524288" \
     -c "pread -v 1048576 524288" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x32 1048576 1048576" \
     -c "pwrite -S 0x33 2097152 1048576" \
@@ -158,7 +157,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x32 1048576 1048576" \
     -c "pread -v 6291456 1048576" \
     -c "pread -v 7340032 1048576" \
     -c "pread -v 8388608 1048576" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x32 1048576 1048576" \
     -c "pwrite -S 0x33 2097152 1048576" \
@@ -179,7 +178,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x32 1048576 1048576" \
     -c "pread -v 7340032 1048576" \
     -c "pread -v 8388608 1048576" \
     -c "pread -v 9437184 1048576" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 $XFS_IO_PROG -f -c "pwrite -S 0x92 10485760 10485760" \
     -c "pwrite -S 0x93 20971520 10485760" \
@@ -200,7 +199,7 @@ $XFS_IO_PROG -f -c "pwrite -S 0x92 10485760 10485760" \
     -c "pread -v 73400320 10485760" \
     -c "pread -v 83886080 10485760" \
     -c "pread -v 94371840 10485760" \
-    $SCRATCH_MNT/aligned_vector_rw | _filter_xfs_io_unique
+    $testdir/aligned_vector_rw | _filter_xfs_io_unique
 
 status=0
 exit
-- 
1.7.10.4


<Prev in Thread] Current Thread [Next in Thread>