xfstests: use a common _filter_scratch function

There are a number of tests that use a shell function called
"filter_scratch" or "_filter_scratch" in order to have the actual
scratch device or mount point show up in test output with a symbolic
name.  There are two sets, each following a slightly different
convention.  Put a common _filter_scratch function definition in
"common.filter" and have all test scripts use that instead.
Choosing one of the two conventions meant that a few test output
files had to be changed.

In addition, add a call to _filter_scratch to test 185, and update
its output accordingly.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/062 b/062
index b29512b0d22ec32cb20994053c0c32d40dc17477..9e7a48817e0c579713d6f40400411bc557eb4342 100755 (executable)
--- a/062
+++ b/062
@@ -46,11 +46,6 @@ _cleanup()
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-_filter_scratch()
-{
-           sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
-}
-
 _linux_attr_calls()
 {
     echo "*** set/get one initially empty attribute"

diff --git a/103 b/103
index 4a6bcb1e2335f191a194bf77053b53462315c66a..1c9994e00b78ddc9237a03d1993f155ec2e6484f 100755 (executable)
--- a/103
+++ b/103
@@ -54,11 +54,6 @@ _create_scratch()
        fi
 }
 
-_filter_scratch()
-{
-       sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
-}
-
 _filter_ln()
 {
     sed -e "s,SCRATCH_MNT/nosymlink/target - Operation not permitted,ln: creating symbolic link \`SCRATCH_MNT/nosymlink/target\' to \`SCRATCH_MNT/nosymlink/source\': Operation not permitted,g" \

diff --git a/108 b/108
index 7fa200af38aea5ee5821d8bde881c626b2efea99..9e9bdba1d79fd935115c1b922cf92ab45b3bfe5e 100755 (executable)
--- a/108
+++ b/108
@@ -37,14 +37,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.filter
 . ./common.quota
 
-filter_scratch()
-{
-       perl -ne "
-s,$SCRATCH_MNT,[SCR_MNT],;
-s,$SCRATCH_DEV,[SCR_DEV],;
-       print;"
-}
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux #IRIX
@@ -59,7 +51,7 @@ test_files()
        chown $uid $SCRATCH_MNT/{buffer,direct,mmap}
        chgrp $gid $SCRATCH_MNT/{buffer,direct,mmap}
        for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
-               $here/src/lstat64 $file | head -3 | filter_scratch
+               $here/src/lstat64 $file | head -3 | _filter_scratch
                $XFS_IO_PROG -c lsproj $file
        done
 }
@@ -78,11 +70,11 @@ test_accounting()
        echo "--- completed parallel IO ($type)" >>$seq.full
 
        for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
-               $here/src/lstat64 $file | head -3 | filter_scratch
+               $here/src/lstat64 $file | head -3 | _filter_scratch
        done
-       xfs_quota -c "quota -hnb -$type $id" $QARGS | filter_scratch
-       xfs_quota -c "quota -hni -$type $id" $QARGS | filter_scratch
-       xfs_quota -c "quota -hnr -$type $id" $QARGS | filter_scratch
+       xfs_quota -c "quota -hnb -$type $id" $QARGS | _filter_scratch
+       xfs_quota -c "quota -hni -$type $id" $QARGS | _filter_scratch
+       xfs_quota -c "quota -hnr -$type $id" $QARGS | _filter_scratch
 }
 
 export MOUNT_OPTIONS="-opquota"

diff --git a/108.out b/108.out
index 7745579919bddf43e616540901ee2ed6591f802e..12bbceea18e8367e473d6101853cb6dcfe8659cc 100644 (file)
--- a/108.out
+++ b/108.out
@@ -9,93 +9,93 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 ### test user accounting
 
 ### create files, setting up ownership (type=u)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
 ### some controlled buffered, direct and mmapd IO (type=u)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 Disk quotas for User #1 (1)
 Filesystem   Blocks  Quota  Limit Warn/Time    Mounted on
-[SCR_DEV]       48M      0      0  00 [------] [SCR_MNT]
+SCRATCH_DEV        48M      0      0  00 [------] SCRATCH_MNT
 Disk quotas for User #1 (1)
 Filesystem    Files  Quota  Limit Warn/Time    Mounted on
-[SCR_DEV]         3      0      0  00 [------] [SCR_MNT]
+SCRATCH_DEV          3      0      0  00 [------] SCRATCH_MNT
 
 ### test group accounting
 
 ### create files, setting up ownership (type=g)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
 ### some controlled buffered, direct and mmapd IO (type=g)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 Disk quotas for Group #2 (2)
 Filesystem   Blocks  Quota  Limit Warn/Time    Mounted on
-[SCR_DEV]       48M      0      0  00 [------] [SCR_MNT]
+SCRATCH_DEV        48M      0      0  00 [------] SCRATCH_MNT
 Disk quotas for Group #2 (2)
 Filesystem    Files  Quota  Limit Warn/Time    Mounted on
-[SCR_DEV]         3      0      0  00 [------] [SCR_MNT]
+SCRATCH_DEV          3      0      0  00 [------] SCRATCH_MNT
 
 ### create files, setting up ownership (type=p)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 0            Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 projid = 3
 ### some controlled buffered, direct and mmapd IO (type=p)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 16777216     Filetype: Regular File
   Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
 Disk quotas for Project #3 (3)
 Filesystem   Blocks  Quota  Limit Warn/Time    Mounted on
-[SCR_DEV]       48M      0      0  00 [------] [SCR_MNT]
+SCRATCH_DEV        48M      0      0  00 [------] SCRATCH_MNT
 Disk quotas for Project #3 (3)
 Filesystem    Files  Quota  Limit Warn/Time    Mounted on
-[SCR_DEV]         3      0      0  00 [------] [SCR_MNT]
+SCRATCH_DEV          3      0      0  00 [------] SCRATCH_MNT

diff --git a/185 b/185
index 74c4d3c39f9185df95a71b5d0e5a4d167a26167e..ed0793c82b1fdb02296c44012e568122070c2533 100755 (executable)
--- a/185
+++ b/185
@@ -71,14 +71,14 @@ cat $tmp.dmapi-param | sed s/'\#.*'//g| grep . |while read l o; do
 
        echo "Method:   xfsctl"
        dd if=/dev/zero bs=1024k count=3 of=$f >/dev/null 2>&1
-       $e -x -l$l -o$o $f
+       $e -x -l$l -o$o $f | _filter_scratch
 
        echo "Method:   dmapi_probe"
        dd if=/dev/zero bs=1024k count=3 of=$f >/dev/null 2>&1
-       $e -l$l -o$o $f
+       $e -l$l -o$o $f | _filter_scratch
 
        echo "Method:   dmapi_punch"
-       $e -p -l$l -o$o $f 
+       $e -p -l$l -o$o $f | _filter_scratch
        echo "======================================================="
 done
 

diff --git a/185.out b/185.out
index 9fdbfca26435d6ecc5a9144882a904c0690e7740..b23552f7ca54066190ebabcb4c45e347e5ea1e2e 100644 (file)
--- a/185.out
+++ b/185.out
@@ -2,70 +2,70 @@ QA output created by 185
 =======================================================
 Testing with length = 16k, offset = 0
 Method:        xfsctl
-Running Punch hole with xfsctl(XFS_IOC_FREESP64) on /mnt/scratch/dmapi/holly_file with settings:
+Running Punch hole with xfsctl(XFS_IOC_FREESP64) on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '0', length = '16384', sid = '0'
 ok.
 Method:        dmapi_probe
-Running DMAPI probe hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI probe hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '0', length = '16384', sid = '0'
 roffp is 0, rlenp is 16384
 Method:        dmapi_punch
-Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI punch hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '0', length = '16384', sid = '0'
 =======================================================
 =======================================================
 Testing with length = 1k, offset = 0
 Method:        xfsctl
-Running Punch hole with xfsctl(XFS_IOC_FREESP64) on /mnt/scratch/dmapi/holly_file with settings:
+Running Punch hole with xfsctl(XFS_IOC_FREESP64) on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '0', length = '1024', sid = '0'
 ok.
 Method:        dmapi_probe
-Running DMAPI probe hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI probe hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '0', length = '1024', sid = '0'
 roffp is 0, rlenp is 1024
 Method:        dmapi_punch
-Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI punch hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '0', length = '1024', sid = '0'
 =======================================================
 =======================================================
 Testing with length = 1k, offset = 4k
 Method:        xfsctl
-Running Punch hole with xfsctl(XFS_IOC_FREESP64) on /mnt/scratch/dmapi/holly_file with settings:
+Running Punch hole with xfsctl(XFS_IOC_FREESP64) on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '4096', length = '1024', sid = '0'
 ok.
 Method:        dmapi_probe
-Running DMAPI probe hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI probe hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '4096', length = '1024', sid = '0'
 roffp is 4096, rlenp is 1024
 Method:        dmapi_punch
-Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI punch hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '4096', length = '1024', sid = '0'
 =======================================================
 =======================================================
 Testing with length = 4k, offset = 1k
 Method:        xfsctl
-Running Punch hole with xfsctl(XFS_IOC_FREESP64) on /mnt/scratch/dmapi/holly_file with settings:
+Running Punch hole with xfsctl(XFS_IOC_FREESP64) on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '1024', length = '4096', sid = '0'
 ok.
 Method:        dmapi_probe
-Running DMAPI probe hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI probe hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '1024', length = '4096', sid = '0'
 roffp is 1024, rlenp is 4096
 Method:        dmapi_punch
-Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI punch hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '1024', length = '4096', sid = '0'
 =======================================================
 =======================================================
 Testing with length = 1024k, offset = 512k
 Method:        xfsctl
-Running Punch hole with xfsctl(XFS_IOC_FREESP64) on /mnt/scratch/dmapi/holly_file with settings:
+Running Punch hole with xfsctl(XFS_IOC_FREESP64) on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '524288', length = '1048576', sid = '0'
 ok.
 Method:        dmapi_probe
-Running DMAPI probe hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI probe hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '524288', length = '1048576', sid = '0'
 roffp is 524288, rlenp is 1048576
 Method:        dmapi_punch
-Running DMAPI punch hole on /mnt/scratch/dmapi/holly_file with settings:
+Running DMAPI punch hole on SCRATCH_MNT/dmapi/holly_file with settings:
   offset = '524288', length = '1048576', sid = '0'
 =======================================================

diff --git a/200 b/200
index dcf0f38b5d33e3b970ee2d6d3ac7cb26c80fc904..d1f7e9dcd860dcb911d744b93a8e45a4ac785366 100755 (executable)
--- a/200
+++ b/200
@@ -30,12 +30,6 @@ here=`pwd`
 tmp=/tmp/$$
 status=1       # failure is the default!
 
-_filter_scratch()
-{
-       sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" | \
-               sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
-}
-
 _cleanup()
 {
        cd /

diff --git a/219 b/219
index 065b5452154c15cd744753c78d04db5ea327a15e..836d703f469328dc4572d28b5435219c3163b9a9 100755 (executable)
--- a/219
+++ b/219
@@ -40,14 +40,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.filter
 . ./common.quota
 
-filter_scratch()
-{
-       perl -ne "
-s,$SCRATCH_MNT,[SCR_MNT],;
-s,$SCRATCH_DEV,[SCR_DEV],;
-       print;"
-}
-
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux #IRIX
@@ -62,7 +54,7 @@ test_files()
        chown $uid $SCRATCH_MNT/{buffer,direct,mmap}
        chgrp $gid $SCRATCH_MNT/{buffer,direct,mmap}
        for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
-               $here/src/lstat64 $file | head -3 | filter_scratch
+               $here/src/lstat64 $file | head -3 | _filter_scratch
        done
 }
 
@@ -82,10 +74,10 @@ test_accounting()
        echo "--- completed parallel IO ($type)" >>$seq.full
 
        for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
-               $here/src/lstat64 $file | head -3 | filter_scratch
+               $here/src/lstat64 $file | head -3 | _filter_scratch
        done
 
-       repquota -$type -n $SCRATCH_MNT  | grep -v "^#0" | filter_scratch |
+       repquota -$type -n $SCRATCH_MNT  | grep -v "^#0" | _filter_scratch |
        awk '/^#/ { if (seen[$1]) next; seen[$1]++; } { print; }'
 }
 

diff --git a/219.out b/219.out
index a51aada0e96175d824c007dd8fa36cc22b6b6302..fadfafcc3eb23b43c8cfd2fd41c83078c5345419 100644 (file)
--- a/219.out
+++ b/219.out
@@ -3,26 +3,26 @@ QA output created by 219
 ### test user accounting
 
 ### create files, setting up ownership (type=u)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 0            Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 0            Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 0            Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
 ### some controlled buffered, direct and mmapd IO (type=u)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 49152        Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 49152        Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 49152        Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-*** Report for user quotas on device [SCR_DEV]
+*** Report for user quotas on device SCRATCH_DEV
 Block grace time: 7days; Inode grace time: 7days
                         Block limits                File limits
 User            used    soft    hard  grace    used  soft  hard  grace
@@ -34,26 +34,26 @@ User            used    soft    hard  grace    used  soft  hard  grace
 ### test group accounting
 
 ### create files, setting up ownership (type=g)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 0            Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 0            Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 0            Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
 ### some controlled buffered, direct and mmapd IO (type=g)
-  File: "[SCR_MNT]/buffer"
+  File: "SCRATCH_MNT/buffer"
   Size: 49152        Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/direct"
+  File: "SCRATCH_MNT/direct"
   Size: 49152        Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-  File: "[SCR_MNT]/mmap"
+  File: "SCRATCH_MNT/mmap"
   Size: 49152        Filetype: Regular File
   Mode: (0644/-rw-r--r--)         Uid: (1)  Gid: (2)
-*** Report for group quotas on device [SCR_DEV]
+*** Report for group quotas on device SCRATCH_DEV
 Block grace time: 7days; Inode grace time: 7days
                         Block limits                File limits
 Group           used    soft    hard  grace    used  soft  hard  grace

diff --git a/223 b/223
index 8f8696be2f064c9dc9b99c2fdeb8f30736fa95b7..cf498ae441c10b44c9723e505bde9cf9ec9c74fe 100755 (executable)
--- a/223
+++ b/223
@@ -51,11 +51,6 @@ _require_xfs_io_falloc
 
 rm -f $seq.full
 
-_filter_scratch()
-{
-       sed -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
-}
-
 BLOCKSIZE=4096
 
 for SUNIT_K in 8 16 32 64 128; do

diff --git a/230 b/230
index fb356731aeeb76ec57fc52962e19ab01e879a822..e66c5b9a07cc36c1c3dcfa7636278256f3cd2b81 100755 (executable)
--- a/230
+++ b/230
@@ -40,14 +40,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.filter
 . ./common.quota
 
-filter_scratch()
-{
-       perl -ne "
-s,$SCRATCH_MNT,[SCR_MNT],;
-s,$SCRATCH_DEV,[SCR_DEV],;
-       print;"
-}
-
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux #IRIX
@@ -96,19 +88,19 @@ test_enforcement()
        setquota -$type $qa_user 0 0 3 5 $SCRATCH_MNT
        echo "Touch 3+4"
        su $qa_user -c "touch $SCRATCH_MNT/file3 $SCRATCH_MNT/file4" \
-               2>&1 >>$seq.full | filter_scratch | tee -a $seq.full
+               2>&1 >>$seq.full | _filter_scratch | tee -a $seq.full
        repquota -$type $SCRATCH_MNT  | grep -v "^root" >>$seq.full 2>&1
        # Try to exceed inode hardlimit
        echo "Touch 5+6"
        su $qa_user -c "touch $SCRATCH_MNT/file5 $SCRATCH_MNT/file6" \
-               2>&1 >>$seq.full | filter_scratch | tee -a $seq.full
+               2>&1 >>$seq.full | _filter_scratch | tee -a $seq.full
        repquota -$type $SCRATCH_MNT  | grep -v "^root" >>$seq.full 2>&1
        # Wait and check grace time enforcement
        rm -f $SCRATCH_MNT/file5 >>$seq.full 2>&1
        sleep $((grace+1))
        echo "Touch 5"
        su $qa_user -c "touch $SCRATCH_MNT/file5" 2>&1 >>$seq.full |
-               filter_scratch | tee -a $seq.full
+               _filter_scratch | tee -a $seq.full
        repquota -$type $SCRATCH_MNT  | grep -v "^root" >>$seq.full 2>&1
        echo "--- completed IO ($type)" >>$seq.full
 }

diff --git a/230.out b/230.out
index 10dd50ce36984a49ac2fdfeb85903d1477558e31..d2d434c804d201297c9bccad53be16f6350413b4 100644 (file)
--- a/230.out
+++ b/230.out
@@ -12,9 +12,9 @@ Write 4096...
 pwrite64: Disk quota exceeded
 Touch 3+4
 Touch 5+6
-touch: cannot touch `[SCR_MNT]/file6': Disk quota exceeded
+touch: cannot touch `SCRATCH_MNT/file6': Disk quota exceeded
 Touch 5
-touch: cannot touch `[SCR_MNT]/file5': Disk quota exceeded
+touch: cannot touch `SCRATCH_MNT/file5': Disk quota exceeded
 
 ### test group limit enforcement
 
@@ -28,6 +28,6 @@ Write 4096...
 pwrite64: Disk quota exceeded
 Touch 3+4
 Touch 5+6
-touch: cannot touch `[SCR_MNT]/file6': Disk quota exceeded
+touch: cannot touch `SCRATCH_MNT/file6': Disk quota exceeded
 Touch 5
-touch: cannot touch `[SCR_MNT]/file5': Disk quota exceeded
+touch: cannot touch `SCRATCH_MNT/file5': Disk quota exceeded

diff --git a/231 b/231
index e499c9a24c92f9235f2553472f3129a0227a1a8b..115b4c0a011fce525e049777999572237fcc5066 100755 (executable)
--- a/231
+++ b/231
@@ -41,14 +41,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 FSX_FILE_SIZE=64000000
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -N 20000"
 
-filter_scratch()
-{
-        perl -ne "
-s,$SCRATCH_MNT,[SCR_MNT],;
-s,$SCRATCH_DEV,[SCR_DEV],;
-        print;"
-}
-
 _fsx()
 {
        tasks=$1

diff --git a/232 b/232
index d5f99bd3e0cc6e943432d9d28ba5ccdc31473af9..fb4a8727c52e09a9c028a3502a38dedf078d9161 100755 (executable)
--- a/232
+++ b/232
@@ -38,14 +38,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.filter
 . ./common.quota
 
-filter_scratch()
-{
-        perl -ne "
-s,$SCRATCH_MNT,[SCR_MNT],;
-s,$SCRATCH_DEV,[SCR_DEV],;
-        print;"
-}
-
 _filter_num()
 {
        tee -a $here/$seq.full |\

diff --git a/233 b/233
index 506093126709979ba667f49f88fa17eb5533d433..e6ba7efda9396fe9c42fc354c4b7a0dcc60f04ec 100755 (executable)
--- a/233
+++ b/233
@@ -42,14 +42,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 FSX_FILE_SIZE=64000000
 FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000"
 
-filter_scratch()
-{
-        perl -ne "
-s,$SCRATCH_MNT,[SCR_MNT],;
-s,$SCRATCH_DEV,[SCR_DEV],;
-        print;"
-}
-
 _filter_num()
 {
        tee -a $here/$seq.full |\

diff --git a/235 b/235
index 97632e55213ff0e4aea80654d0ec82873a414367..5d9c7c0f1e921a814aa529f46d88fdbd6e15d247 100755 (executable)
--- a/235
+++ b/235
@@ -40,14 +40,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.filter
 . ./common.quota
 
-filter_scratch()
-{
-       perl -ne "
-s,$SCRATCH_MNT,[SCR_MNT],;
-s,$SCRATCH_DEV,[SCR_DEV],;
-       print;"
-}
-
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux #IRIX
@@ -67,15 +59,15 @@ quotaon $SCRATCH_MNT 2>/dev/null
 touch $SCRATCH_MNT/testfile
 chown $qa_user:$qa_user $SCRATCH_MNT/testfile
 
-repquota -u -g $SCRATCH_MNT  | grep -v "^root" | filter_scratch
+repquota -u -g $SCRATCH_MNT  | grep -v "^root" | _filter_scratch
 
-mount -o remount,ro $SCRATCH_DEV 2>&1 | tee -a $seq.full | filter_scratch
-touch $SCRATCH_MNT/failed 2>&1 | tee -a $seq.full | filter_scratch
-mount -o remount,rw $SCRATCH_DEV 2>&1 | tee -a $seq.full | filter_scratch
+mount -o remount,ro $SCRATCH_DEV 2>&1 | tee -a $seq.full | _filter_scratch
+touch $SCRATCH_MNT/failed 2>&1 | tee -a $seq.full | _filter_scratch
+mount -o remount,rw $SCRATCH_DEV 2>&1 | tee -a $seq.full | _filter_scratch
 
 $XFS_IO_PROG -F -c 'pwrite 0 16k' -c 'fsync' \
                        $SCRATCH_MNT/testfile >>$seq.full 2>&1
-repquota -u -g $SCRATCH_MNT  | grep -v "^root" | filter_scratch
+repquota -u -g $SCRATCH_MNT  | grep -v "^root" | _filter_scratch
 
 umount $SCRATCH_DEV 2>/dev/null
 

diff --git a/235.out b/235.out
index 8d3eb1f7faa886a2d89fe8e1d733114081be5c3f..345e29d686edfba03b044a7574ffae32a837152c 100644 (file)
--- a/235.out
+++ b/235.out
@@ -1,5 +1,5 @@
 QA output created by 235
-*** Report for user quotas on device [SCR_DEV]
+*** Report for user quotas on device SCRATCH_DEV
 Block grace time: 7days; Inode grace time: 7days
                         Block limits                File limits
 User            used    soft    hard  grace    used  soft  hard  grace
@@ -7,7 +7,7 @@ User            used    soft    hard  grace    used  soft  hard  grace
 fsgqa     --       0       0       0              1     0     0       
 
 
-*** Report for group quotas on device [SCR_DEV]
+*** Report for group quotas on device SCRATCH_DEV
 Block grace time: 7days; Inode grace time: 7days
                         Block limits                File limits
 Group           used    soft    hard  grace    used  soft  hard  grace
@@ -15,8 +15,8 @@ Group           used    soft    hard  grace    used  soft  hard  grace
 fsgqa     --       0       0       0              1     0     0       
 
 
-touch: cannot touch `[SCR_MNT]/failed': Read-only file system
-*** Report for user quotas on device [SCR_DEV]
+touch: cannot touch `SCRATCH_MNT/failed': Read-only file system
+*** Report for user quotas on device SCRATCH_DEV
 Block grace time: 7days; Inode grace time: 7days
                         Block limits                File limits
 User            used    soft    hard  grace    used  soft  hard  grace
@@ -24,7 +24,7 @@ User            used    soft    hard  grace    used  soft  hard  grace
 fsgqa     --      16       0       0              1     0     0       
 
 
-*** Report for group quotas on device [SCR_DEV]
+*** Report for group quotas on device SCRATCH_DEV
 Block grace time: 7days; Inode grace time: 7days
                         Block limits                File limits
 Group           used    soft    hard  grace    used  soft  hard  grace

diff --git a/common.filter b/common.filter
index a0034c614ad8e2431c15ec8e38ba80a2462eae69..c2e45689c2388e784c894d580d27e264a3308a4b 100644 (file)
--- a/common.filter
+++ b/common.filter
@@ -214,5 +214,10 @@ _filter_xfs_io_unique()
     common_line_filter | _filter_xfs_io
 }
 
+_filter_scratch()
+{
+       sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
+}
+
 # make sure this script returns success
 /bin/true

diff --git a/common.quota b/common.quota
index acf18a84913554cb2a7f9873ac021fa4a4d17e0f..96a36a641d3d0ac528e01f1364d6117fe5be65d9 100644 (file)
--- a/common.quota
+++ b/common.quota
@@ -234,9 +234,9 @@ _check_quota_usage()
                VFS_QUOTA=1
                quotaon -f -u -g $SCRATCH_MNT 2>/dev/null
        fi
-       repquota -u -n $SCRATCH_MNT  | grep -v "^#0" | filter_scratch |
+       repquota -u -n $SCRATCH_MNT  | grep -v "^#0" | _filter_scratch |
                sort >$tmp.user.orig
-       repquota -g -n $SCRATCH_MNT  | grep -v "^#0" | filter_scratch |
+       repquota -g -n $SCRATCH_MNT  | grep -v "^#0" | _filter_scratch |
                sort >$tmp.group.orig
        if [ $VFS_QUOTA -eq 1 ]; then
                quotacheck -u -g $SCRATCH_MNT 2>/dev/null
@@ -245,9 +245,9 @@ _check_quota_usage()
                mount -o remount,noquota $SCRATCH_DEV
                mount -o remount,usrquota,grpquota $SCRATCH_DEV
        fi
-       repquota -u -n $SCRATCH_MNT  | grep -v "^#0" | filter_scratch |
+       repquota -u -n $SCRATCH_MNT  | grep -v "^#0" | _filter_scratch |
                sort >$tmp.user.checked
-       repquota -g -n $SCRATCH_MNT  | grep -v "^#0" | filter_scratch |
+       repquota -g -n $SCRATCH_MNT  | grep -v "^#0" | _filter_scratch |
                sort >$tmp.group.checked
        if [ $VFS_QUOTA -eq 1 ]; then
                quotaon -u -g $SCRATCH_MNT 2>/dev/null