xfs
[Top] [All Lists]

[PATCH] xfstests: handle xfs_quota output w/ long devicenames

To: xfs-oss <xfs@xxxxxxxxxxx>
Subject: [PATCH] xfstests: handle xfs_quota output w/ long devicenames
From: Eric Sandeen <sandeen@xxxxxxxxxx>
Date: Sun, 06 Oct 2013 17:46:19 -0500
Delivered-to: xfs@xxxxxxxxxxx
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130801 Thunderbird/17.0.8
Long device names may be split onto their own line
on quota output:

Filesystem   Blocks  Quota  Limit Warn/Time    Mounted on
/dev/mapper/my-very-very-very-long-devicename
                48M      0      0  00 [------] /mnt/scratch

which breaks tests that capture quota output - currently,
only xfs/108.

Add a _filter_quota() which fixes this.

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---



diff --git a/common/filter b/common/filter
index 066b353..a0d9d2a 100644
--- a/common/filter
+++ b/common/filter
@@ -240,6 +240,15 @@ _filter_spaces()
        sed -e 's/ [ ]*/ /g'
 }
 
+_filter_quota()
+{
+       # Long dev name might be split onto its own line; last
+       # seds remove that newline if present
+       _filter_scratch | _filter_test_dir | _filter_spaces | \
+       sed -e 'N;s/SCRATCH_DEV\n/SCRATCH_DEV/g' | \
+       sed -e 'N;s/TEST_DEV\n/TEST_DEV/g'
+}
+
 # Account for different "ln" failure messages
 _filter_ln()
 {
diff --git a/tests/xfs/108 b/tests/xfs/108
index 82694f1..5030f63 100755
--- a/tests/xfs/108
+++ b/tests/xfs/108
@@ -71,9 +71,9 @@ test_accounting()
        for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
                $here/src/lstat64 $file | head -3 | _filter_scratch
        done
-       xfs_quota -c "quota -hnb -$type $id" $QARGS | _filter_scratch | 
_filter_spaces
-       xfs_quota -c "quota -hni -$type $id" $QARGS | _filter_scratch | 
_filter_spaces
-       xfs_quota -c "quota -hnr -$type $id" $QARGS | _filter_scratch | 
_filter_spaces
+       xfs_quota -c "quota -hnb -$type $id" $QARGS | _filter_quota
+       xfs_quota -c "quota -hni -$type $id" $QARGS | _filter_quota
+       xfs_quota -c "quota -hnr -$type $id" $QARGS | _filter_quota
 }
 
 export MOUNT_OPTIONS="-opquota"

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