* [PATCH] xfstests: fix 108 golden output
@ 2010-11-10 12:58 Christoph Hellwig
2010-11-17 9:17 ` Christoph Hellwig
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Christoph Hellwig @ 2010-11-10 12:58 UTC (permalink / raw)
To: xfs
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 <hch@lst.de>
Index: xfstests-dev/108.out
===================================================================
--- xfstests-dev.orig/108.out 2010-11-10 12:53:41.000000000 +0000
+++ xfstests-dev/108.out 2010-11-10 12:53:48.000000000 +0000
@@ -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
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] xfstests: fix 108 golden output
2010-11-10 12:58 [PATCH] xfstests: fix 108 golden output Christoph Hellwig
@ 2010-11-17 9:17 ` Christoph Hellwig
2010-11-18 5:44 ` Dave Chinner
2010-12-09 21:19 ` Alex Elder
2 siblings, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2010-11-17 9:17 UTC (permalink / raw)
To: xfs
ping?
On Wed, Nov 10, 2010 at 07:58:55AM -0500, Christoph Hellwig wrote:
> 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 <hch@lst.de>
>
> Index: xfstests-dev/108.out
> ===================================================================
> --- xfstests-dev.orig/108.out 2010-11-10 12:53:41.000000000 +0000
> +++ xfstests-dev/108.out 2010-11-10 12:53:48.000000000 +0000
> @@ -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
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
---end quoted text---
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xfstests: fix 108 golden output
2010-11-10 12:58 [PATCH] xfstests: fix 108 golden output Christoph Hellwig
2010-11-17 9:17 ` Christoph Hellwig
@ 2010-11-18 5:44 ` Dave Chinner
2010-12-09 21:19 ` Alex Elder
2 siblings, 0 replies; 5+ messages in thread
From: Dave Chinner @ 2010-11-18 5:44 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: xfs
On Wed, Nov 10, 2010 at 07:58:55AM -0500, Christoph Hellwig wrote:
> 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.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xfstests: fix 108 golden output
2010-11-10 12:58 [PATCH] xfstests: fix 108 golden output Christoph Hellwig
2010-11-17 9:17 ` Christoph Hellwig
2010-11-18 5:44 ` Dave Chinner
@ 2010-12-09 21:19 ` Alex Elder
2010-12-10 10:06 ` Boris Ranto
2 siblings, 1 reply; 5+ messages in thread
From: Alex Elder @ 2010-12-09 21:19 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: branto, xfs
On Wed, 2010-11-10 at 07:58 -0500, Christoph Hellwig wrote:
> 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 <hch@lst.de>
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
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xfstests: fix 108 golden output
2010-12-09 21:19 ` Alex Elder
@ 2010-12-10 10:06 ` Boris Ranto
0 siblings, 0 replies; 5+ messages in thread
From: Boris Ranto @ 2010-12-10 10:06 UTC (permalink / raw)
To: aelder; +Cc: Christoph Hellwig, xfs
On Thu, 2010-12-09 at 15:19 -0600, Alex Elder wrote:
> On Wed, 2010-11-10 at 07:58 -0500, Christoph Hellwig wrote:
> > 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 <hch@lst.de>
>
> 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
>
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
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-10 10:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-10 12:58 [PATCH] xfstests: fix 108 golden output Christoph Hellwig
2010-11-17 9:17 ` Christoph Hellwig
2010-11-18 5:44 ` Dave Chinner
2010-12-09 21:19 ` Alex Elder
2010-12-10 10:06 ` Boris Ranto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox