xfstests: fix 108 golden output
PATCH 1/1 xfstests: fix 108 golden output
The new common scratch mount filter produces slightly different whitespaces than the old home grown filter, so adjust the golden output.
108.out +6 -6
@@ -33,10 +33,10 @@ projid = 3 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 +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 +SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT ### test group accounting
@@ -65,10 +65,10 @@ projid = 3 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 +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 +SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT ### create files, setting up ownership (type=p) File: "SCRATCH_MNT/buffer"
@@ -95,7 +95,7 @@ projid = 3 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 +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 +SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
ping?
Quoted 47 lines · Christoph Hellwig
The new common scratch mount filter produces slightly different whitespaces than the old home grown filter, so adjust the golden output.
Signed-off-by Christoph Hellwig <[email protected]>Index: xfstests-dev/108.out
===================================================================108.out +6
-6@@ -33,10 +33,10 @@ projid = 3 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 +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 +SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT ### test group accounting@@ -65,10 +65,10 @@ projid = 3 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 +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 +SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT ### create files, setting up ownership (type=p) File: "SCRATCH_MNT/buffer"@@ -95,7 +95,7 @@ projid = 3 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 +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 +SCRATCH_DEV 3 0 0 00 [------] SCRATCH_MNT
Quoted 4 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
---end quoted text---
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 3 lines · Christoph Hellwig
The new common scratch mount filter produces slightly different whitespaces than the old home grown filter, so adjust the golden output.
I'm not seeing it fail with the new filter, so I'm not sure whether there's a whitespace problem. The userspace i just tested on is 3.1.2, maybe there's something different at your end?
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 5 lines · Christoph Hellwig
The new common scratch mount filter produces slightly different whitespaces than the old home grown filter, so adjust the golden output.
Signed-off-by Christoph Hellwig <[email protected]>
I found out why this is happening. I get no such error, and Dave Chinner said he wasn't seeing it either.
xfs_quota is formatting its output such that the second and later columns always align at a certain offset from the beginning of the line. As a result, path names assigned as SCRATCH_DEV of different lengths will produce different (filtered) output, with more or fewer blanks between SCRATCH_DEV and the usage number.
Boris Ranto has proposed a change that would add the "-b" flag to diff when checking output against golden output. That should fix it, but it's possible we *want* differences in white space to matter in some cases. Have to look into this.
-Alex
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 19 lines · Alex Elder
Quoted 5 lines · Christoph Hellwig
The new common scratch mount filter produces slightly different whitespaces than the old home grown filter, so adjust the golden output.
Signed-off-by Christoph Hellwig <[email protected]>I found out why this is happening. I get no such error, and Dave Chinner said he wasn't seeing it either.
xfs_quotais formatting its output such that the second and later columns always align at a certain offset from the beginning of the line. As a result, path names assigned asSCRATCH_DEVof different lengths will produce different (filtered) output, with more or fewer blanks betweenSCRATCH_DEVand the usage number.
Quoted 9 lines
Boris Ranto has proposed a change that would add the "-b" flag to diff when checking output against golden output. That should fix it, but it's possible we *want* differences in white space to matter in some cases. Have to look into this.
-Alex
The change was designed to add the "-b" flag only for this test case. Any other test case could also modify its diff options through DIFF_OPTIONS variable in its config file ($seq.config).
-Boris
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs