On Fri, 2010-12-10 at 09:37 -0500, Christoph Hellwig wrote:
> I don't rally like the per-test option. What about adding a
> _filter_xfs_quota helper that uses sed to output a canonical
> number of whitespaces?
>
I didn't like it much either but I found it quite easy to implement with quite high probability of future usage.
I found the following modification sufficient although I'm not sure I put the _filter_spaces in right place (I'd say it's quite universal so it could find a usage in other cases):
diff -urpN a/xfstests/108 b/xfstests/108
--- a/xfstests/108 2010-12-09 11:34:37.733245986 +0100
+++ b/xfstests/108 2010-12-14 14:50:16.813494309 +0100
@@ -72,9 +72,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
- 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 | _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
}
export MOUNT_OPTIONS="-opquota"
diff -urpN a/xfstests/108.out b/xfstests/108.out
--- a/xfstests/108.out 2010-12-09 11:24:48.973251551 +0100
+++ b/xfstests/108.out 2010-12-14 15:01:33.640484268 +0100
@@ -32,11 +32,11 @@ projid = 3
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
-SCRATCH_DEV 48M 0 0 00 [------] SCRATCH_MNT
+Filesystem Blocks Quota Limit Warn/Time Mounted on
+SCRATCH_DEV 48M 0 0 00 [------] SCRATCH_MNT
Disk quotas for User #1 (1)
-Filesystem Files Quota Limit Warn/Time Mounted on
-SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT
+Filesystem Files Quota Limit Warn/Time Mounted on
+SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT
### test group accounting
@@ -64,11 +64,11 @@ projid = 3
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
-SCRATCH_DEV 48M 0 0 00 [------] SCRATCH_MNT
+Filesystem Blocks Quota Limit Warn/Time Mounted on
+SCRATCH_DEV 48M 0 0 00 [------] SCRATCH_MNT
Disk quotas for Group #2 (2)
-Filesystem Files Quota Limit Warn/Time Mounted on
-SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT
+Filesystem Files Quota Limit Warn/Time Mounted on
+SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT
### create files, setting up ownership (type=p)
File: "SCRATCH_MNT/buffer"
@@ -94,8 +94,8 @@ projid = 3
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
-SCRATCH_DEV 48M 0 0 00 [------] SCRATCH_MNT
+Filesystem Blocks Quota Limit Warn/Time Mounted on
+SCRATCH_DEV 48M 0 0 00 [------] SCRATCH_MNT
Disk quotas for Project #3 (3)
-Filesystem Files Quota Limit Warn/Time Mounted on
-SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT
+Filesystem Files Quota Limit Warn/Time Mounted on
+SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT
diff -urpN a/xfstests/common.filter b/xfstests/common.filter
--- a/xfstests/common.filter 2010-12-09 11:24:44.315240233 +0100
+++ b/xfstests/common.filter 2010-12-14 14:45:53.566228712 +0100
@@ -224,5 +224,10 @@ _filter_scratch()
sed -e "s,$SCRATCH_DEV,SCRATCH_DEV,g" -e "s,$SCRATCH_MNT,SCRATCH_MNT,g"
}
+_filter_spaces()
+{
+ sed -e 's/ [ ]*/ /g'
+}
+
# make sure this script returns success
/bin/true
Signed-off-by: Boris Ranto <branto@xxxxxxxxxx>
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
