* [PATCH 0/1] small fix for newer util-linux
@ 2017-11-14 1:09 Misono, Tomohiro
2017-11-14 1:10 ` [PATCH 1/1] overlay/035: " Misono, Tomohiro
0 siblings, 1 reply; 4+ messages in thread
From: Misono, Tomohiro @ 2017-11-14 1:09 UTC (permalink / raw
To: fstests
Hello,
I noticed util-linux 2.30 has changed some output messages
and therefore overlay/035 falsely fails.
I checked btrfs/generic/overlay and found the error only for this
(though some are skipped), so just modify the overlay/035.
If there exists more general way to handle the problem, please ignore this.
Regards,
Tomohiro Misono (1):
overlay/035: small fix for newer util-linux
tests/overlay/035 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--
2.13.6
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] overlay/035: small fix for newer util-linux
2017-11-14 1:09 [PATCH 0/1] small fix for newer util-linux Misono, Tomohiro
@ 2017-11-14 1:10 ` Misono, Tomohiro
2017-11-14 8:55 ` Amir Goldstein
0 siblings, 1 reply; 4+ messages in thread
From: Misono, Tomohiro @ 2017-11-14 1:10 UTC (permalink / raw
To: fstests
Modify filter in order make the test run correctly for
both old (2.29) and new (2.30) util-linux.
Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
---
tests/overlay/035 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/overlay/035 b/tests/overlay/035
index 64fcd708..6f1627c6 100755
--- a/tests/overlay/035
+++ b/tests/overlay/035
@@ -69,7 +69,8 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
$MOUNT_PROG -t overlay -o"lowerdir=$lowerdir2:$lowerdir1" \
$OVL_BASE_SCRATCH_MNT $SCRATCH_MNT
touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
-_scratch_remount rw 2>&1 | _filter_scratch
+_scratch_remount rw 2>&1 | _filter_scratch \
+ | sed -e "s,SCRATCH_MNT: ,," | sed -e "s,\.$,,"
$UMOUNT_PROG $SCRATCH_MNT
# Make workdir immutable to prevent workdir re-create on mount
@@ -79,7 +80,8 @@ $CHATTR_PROG +i $workdir
# Verify that overlay is mounted read-only and that it cannot be remounted rw.
_overlay_scratch_mount_dirs $lowerdir2 $upperdir $workdir
touch $SCRATCH_MNT/bar 2>&1 | _filter_scratch
-_scratch_remount rw 2>&1 | _filter_scratch
+_scratch_remount rw 2>&1 | _filter_scratch \
+ | sed -e "s,SCRATCH_MNT: ,," | sed -e "s,\.$,,"
# success, all done
status=0
--
2.13.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] overlay/035: small fix for newer util-linux
2017-11-14 1:10 ` [PATCH 1/1] overlay/035: " Misono, Tomohiro
@ 2017-11-14 8:55 ` Amir Goldstein
2017-11-14 9:15 ` Eryu Guan
0 siblings, 1 reply; 4+ messages in thread
From: Amir Goldstein @ 2017-11-14 8:55 UTC (permalink / raw
To: Misono, Tomohiro; +Cc: fstests
On Tue, Nov 14, 2017 at 3:10 AM, Misono, Tomohiro
<misono.tomohiro@jp.fujitsu.com> wrote:
> Modify filter in order make the test run correctly for
> both old (2.29) and new (2.30) util-linux.
>
> Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
> ---
> tests/overlay/035 | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tests/overlay/035 b/tests/overlay/035
> index 64fcd708..6f1627c6 100755
> --- a/tests/overlay/035
> +++ b/tests/overlay/035
> @@ -69,7 +69,8 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
> $MOUNT_PROG -t overlay -o"lowerdir=$lowerdir2:$lowerdir1" \
> $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT
> touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
> -_scratch_remount rw 2>&1 | _filter_scratch
> +_scratch_remount rw 2>&1 | _filter_scratch \
> + | sed -e "s,SCRATCH_MNT: ,," | sed -e "s,\.$,,"
> $UMOUNT_PROG $SCRATCH_MNT
>
This change doesn't look right and/or not explained properly.
Any change to accommodate tool differences should be done
in the filter helpers, not in an individual test that filters the
output of a generic helper.
What is the change 2.29 -> 2.30 that causes the problem?
Without mentioning this, it is really hard to review if your change is correct.
Amir.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] overlay/035: small fix for newer util-linux
2017-11-14 8:55 ` Amir Goldstein
@ 2017-11-14 9:15 ` Eryu Guan
0 siblings, 0 replies; 4+ messages in thread
From: Eryu Guan @ 2017-11-14 9:15 UTC (permalink / raw
To: Amir Goldstein; +Cc: Misono, Tomohiro, fstests
On Tue, Nov 14, 2017 at 10:55:34AM +0200, Amir Goldstein wrote:
> On Tue, Nov 14, 2017 at 3:10 AM, Misono, Tomohiro
> <misono.tomohiro@jp.fujitsu.com> wrote:
> > Modify filter in order make the test run correctly for
> > both old (2.29) and new (2.30) util-linux.
> >
> > Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
> > ---
> > tests/overlay/035 | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/tests/overlay/035 b/tests/overlay/035
> > index 64fcd708..6f1627c6 100755
> > --- a/tests/overlay/035
> > +++ b/tests/overlay/035
> > @@ -69,7 +69,8 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
> > $MOUNT_PROG -t overlay -o"lowerdir=$lowerdir2:$lowerdir1" \
> > $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT
> > touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
> > -_scratch_remount rw 2>&1 | _filter_scratch
> > +_scratch_remount rw 2>&1 | _filter_scratch \
> > + | sed -e "s,SCRATCH_MNT: ,," | sed -e "s,\.$,,"
> > $UMOUNT_PROG $SCRATCH_MNT
> >
>
>
> This change doesn't look right and/or not explained properly.
> Any change to accommodate tool differences should be done
> in the filter helpers, not in an individual test that filters the
> output of a generic helper.
If this is a really cornor case that only affects this case and not
likely affects future tests, I think this one-time fix is fine.
But this is not that case. I found generic/050, xfs/005, xfs/333 and
overlay/03[567] are all affected by the change in util-linux, and in
different ways. So generic helper(s) might be more useful.
I'm now working on a patchset to do the filter using common helpers,
will post them later.
>
> What is the change 2.29 -> 2.30 that causes the problem?
> Without mentioning this, it is really hard to review if your change is correct.
Agreed, at least please provide both 'old' and 'new' format in the
commit log or comments, that'll be easier to review.
Thanks,
Eryu
>
> Amir.
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-14 9:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-14 1:09 [PATCH 0/1] small fix for newer util-linux Misono, Tomohiro
2017-11-14 1:10 ` [PATCH 1/1] overlay/035: " Misono, Tomohiro
2017-11-14 8:55 ` Amir Goldstein
2017-11-14 9:15 ` Eryu Guan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.