| Message ID | 5f6cd84d-6e12-2b23-09fc-c0f744d1d2f2@jp.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 01, 2017 at 02:39:44PM +0900, Misono, Tomohiro wrote: > Several tests uses both _filter_test_dir and _filter_scratch > concatenated by pipe to filter $TEST_DIR and $SCRATCH_MNT. However, this > would fail if the shorter string is a substring of the other (like > "/mnt" and "/mnt2"). > > This patch introduces new common filter function to safely call both > _filter_test_dir and _filter_scratch. > > I chedked this with btrfs/029, generic/409,410,411, and generic/381,383, > xfs/106,108 (which calls _filter_quota). Thanks Eryu for advice. > > Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> Thanks! Though I don't think we need two separate patches, so I merged the two patches together at commit time. > --- > common/filter | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/common/filter b/common/filter > index 1ef342b..75570f9 100644 > --- a/common/filter > +++ b/common/filter > @@ -295,6 +295,17 @@ _filter_scratch() > -e "/.use_space/d" > } > > +_filter_testdir_and_scratch() > +{ > + # filter both $TEST_DIR and $SCRATCH_MNT, but always filter the longer > + # string first if the other string is a substring of the first one > + if echo "$TEST_DIR" | grep -q "$SCRATCH_MNT"; then > + _filter_test_dir | _filter_scratch > + else > + _filter_scratch | _filter_test_dir And fixed the indention here, used tab :) Thanks, Eryu > + fi > +} > + > # Turn any device in the scratch pool into SCRATCH_DEV > _filter_scratch_pool() > { > -- > 2.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 1, 2017 at 10:04 AM, Eryu Guan <eguan@redhat.com> wrote: > On Fri, Sep 01, 2017 at 02:39:44PM +0900, Misono, Tomohiro wrote: >> Several tests uses both _filter_test_dir and _filter_scratch >> concatenated by pipe to filter $TEST_DIR and $SCRATCH_MNT. However, this >> would fail if the shorter string is a substring of the other (like >> "/mnt" and "/mnt2"). >> >> This patch introduces new common filter function to safely call both >> _filter_test_dir and _filter_scratch. >> >> I chedked this with btrfs/029, generic/409,410,411, and generic/381,383, >> xfs/106,108 (which calls _filter_quota). Thanks Eryu for advice. >> >> Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> > > Thanks! Though I don't think we need two separate patches, so I merged > the two patches together at commit time. > FYI, there is still a way for a creative user to mess this up: TEST_DEV=/test TEST_DIR=/test/ovl-mnt SCRATCH_DEV=/ovl SCRATCH_MNT=/ovl/ovl-mnt $SCRATCH_DEV is a substring of $TEST_DIR and _filter_scratch is run first. It's not that crazy to get to this config with the 'new' -overlay command, e.g.: TEST_DEV=/dev/sda TEST_DIR=/test SCRATCH_DEV=/dev/sdb SCRATCH_MNT=/ovl Will be auto converted to the values above. This patch didn't break this use case. >> --- >> common/filter | 11 +++++++++++ >> 1 file changed, 11 insertions(+) >> >> diff --git a/common/filter b/common/filter >> index 1ef342b..75570f9 100644 >> --- a/common/filter >> +++ b/common/filter >> @@ -295,6 +295,17 @@ _filter_scratch() >> -e "/.use_space/d" >> } >> >> +_filter_testdir_and_scratch() >> +{ >> + # filter both $TEST_DIR and $SCRATCH_MNT, but always filter the longer >> + # string first if the other string is a substring of the first one >> + if echo "$TEST_DIR" | grep -q "$SCRATCH_MNT"; then >> + _filter_test_dir | _filter_scratch >> + else >> + _filter_scratch | _filter_test_dir > > And fixed the indention here, used tab :) > > Thanks, > Eryu > >> + fi >> +} >> + >> # Turn any device in the scratch pool into SCRATCH_DEV >> _filter_scratch_pool() >> { >> -- >> 2.9.5 >> > -- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 01, 2017 at 10:14:41AM +0300, Amir Goldstein wrote: > On Fri, Sep 1, 2017 at 10:04 AM, Eryu Guan <eguan@redhat.com> wrote: > > On Fri, Sep 01, 2017 at 02:39:44PM +0900, Misono, Tomohiro wrote: > >> Several tests uses both _filter_test_dir and _filter_scratch > >> concatenated by pipe to filter $TEST_DIR and $SCRATCH_MNT. However, this > >> would fail if the shorter string is a substring of the other (like > >> "/mnt" and "/mnt2"). > >> > >> This patch introduces new common filter function to safely call both > >> _filter_test_dir and _filter_scratch. > >> > >> I chedked this with btrfs/029, generic/409,410,411, and generic/381,383, > >> xfs/106,108 (which calls _filter_quota). Thanks Eryu for advice. > >> > >> Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> > > > > Thanks! Though I don't think we need two separate patches, so I merged > > the two patches together at commit time. > > > > FYI, there is still a way for a creative user to mess this up: > > TEST_DEV=/test > TEST_DIR=/test/ovl-mnt > SCRATCH_DEV=/ovl > SCRATCH_MNT=/ovl/ovl-mnt > > $SCRATCH_DEV is a substring of $TEST_DIR > and _filter_scratch is run first. > > It's not that crazy to get to this config with the 'new' > -overlay command, e.g.: > TEST_DEV=/dev/sda > TEST_DIR=/test > SCRATCH_DEV=/dev/sdb > SCRATCH_MNT=/ovl > > Will be auto converted to the values above. Yeah, overlay makes it more complicated. > > This patch didn't break this use case. Good to know! I just tested this config with a quick overlay tests run, it did pass. Seems like we need some tests for fstests itself, like ./check selftest ? :) Thanks, Eryu > > >> --- > >> common/filter | 11 +++++++++++ > >> 1 file changed, 11 insertions(+) > >> > >> diff --git a/common/filter b/common/filter > >> index 1ef342b..75570f9 100644 > >> --- a/common/filter > >> +++ b/common/filter > >> @@ -295,6 +295,17 @@ _filter_scratch() > >> -e "/.use_space/d" > >> } > >> > >> +_filter_testdir_and_scratch() > >> +{ > >> + # filter both $TEST_DIR and $SCRATCH_MNT, but always filter the longer > >> + # string first if the other string is a substring of the first one > >> + if echo "$TEST_DIR" | grep -q "$SCRATCH_MNT"; then > >> + _filter_test_dir | _filter_scratch > >> + else > >> + _filter_scratch | _filter_test_dir > > > > And fixed the indention here, used tab :) > > > > Thanks, > > Eryu > > > >> + fi > >> +} > >> + > >> # Turn any device in the scratch pool into SCRATCH_DEV > >> _filter_scratch_pool() > >> { > >> -- > >> 2.9.5 > >> > > -- > > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/common/filter b/common/filter index 1ef342b..75570f9 100644 --- a/common/filter +++ b/common/filter @@ -295,6 +295,17 @@ _filter_scratch() -e "/.use_space/d" } +_filter_testdir_and_scratch() +{ + # filter both $TEST_DIR and $SCRATCH_MNT, but always filter the longer + # string first if the other string is a substring of the first one + if echo "$TEST_DIR" | grep -q "$SCRATCH_MNT"; then + _filter_test_dir | _filter_scratch + else + _filter_scratch | _filter_test_dir + fi +} + # Turn any device in the scratch pool into SCRATCH_DEV _filter_scratch_pool() {
Several tests uses both _filter_test_dir and _filter_scratch concatenated by pipe to filter $TEST_DIR and $SCRATCH_MNT. However, this would fail if the shorter string is a substring of the other (like "/mnt" and "/mnt2"). This patch introduces new common filter function to safely call both _filter_test_dir and _filter_scratch. I chedked this with btrfs/029, generic/409,410,411, and generic/381,383, xfs/106,108 (which calls _filter_quota). Thanks Eryu for advice. Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com> --- common/filter | 11 +++++++++++ 1 file changed, 11 insertions(+)