| Message ID | 20151007051323.3260.60421.stgit@birch.djwong.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> +# this test requires the test fs support reflink... > +# > +_require_test_reflink() > +{ > + case $FSTYP in > + xfs) > + xfs_info "${TEST_DIR}" | grep reflink=1 -c -q || _notrun "Reflink not supported by this filesystem type: $FSTYP" > + ;; > + btrfs) > + true > + ;; > + *) > + _notrun "Reflink not supported by this filesystem type: $FSTYP" > + ;; > + esac I don't think that's a good test - we need to check if it's supported by trying it. That'll automatically get us coverage for other file systems like xfs. Note that dedup should get it's own feature check, as currently hacking nfs into this check will also run dedup tests that can't really be supported. -- 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
On Thu, Oct 15, 2015 at 02:19:44AM -0700, Christoph Hellwig wrote: > > +# this test requires the test fs support reflink... > > +# > > +_require_test_reflink() > > +{ > > + case $FSTYP in > > + xfs) > > + xfs_info "${TEST_DIR}" | grep reflink=1 -c -q || _notrun "Reflink not supported by this filesystem type: $FSTYP" > > + ;; > > + btrfs) > > + true > > + ;; > > + *) > > + _notrun "Reflink not supported by this filesystem type: $FSTYP" > > + ;; > > + esac > > I don't think that's a good test - we need to check if it's supported by > trying it. That'll automatically get us coverage for other file systems > like xfs. > > Note that dedup should get it's own feature check, as currently hacking > nfs into this check will also run dedup tests that can't really be > supported. Good point. I'll throw that in while I rework the tests. --D > -- > 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 fstests" 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/rc b/common/rc index 3e97060..7e2f140 100644 --- a/common/rc +++ b/common/rc @@ -1429,6 +1429,43 @@ _require_scratch_xfs_crc() umount $SCRATCH_MNT } +# this test requires the test fs support reflink... +# +_require_test_reflink() +{ + case $FSTYP in + xfs) + xfs_info "${TEST_DIR}" | grep reflink=1 -c -q || _notrun "Reflink not supported by this filesystem type: $FSTYP" + ;; + btrfs) + true + ;; + *) + _notrun "Reflink not supported by this filesystem type: $FSTYP" + ;; + esac +} + +# this test requires the scratch fs support reflink... +# +_require_scratch_reflink() +{ + case $FSTYP in + xfs) + _scratch_mkfs > /dev/null 2>&1 + _scratch_mount + xfs_info "${TEST_DIR}" | grep reflink=1 -c -q || _notrun "$FSTYP does not support reflink" + _scratch_unmount + ;; + btrfs) + true + ;; + *) + _notrun "Reflink not supported by this filesystem type: $FSTYP" + ;; + esac +} + # this test requires the bigalloc feature to be available in mkfs.ext4 # _require_ext4_mkfs_bigalloc() diff --git a/tests/generic/800 b/tests/generic/800 index a71f11a..954f39d 100755 --- a/tests/generic/800 +++ b/tests/generic/800 @@ -45,7 +45,7 @@ _cleanup() . common/filter # real QA test starts here -_supported_fs btrfs +_require_test_reflink _supported_os Linux _require_xfs_io_command "fiemap" diff --git a/tests/generic/801 b/tests/generic/801 index b21c44b..aedb6e9 100755 --- a/tests/generic/801 +++ b/tests/generic/801 @@ -45,7 +45,7 @@ _cleanup() . common/filter # real QA test starts here -_supported_fs btrfs +_require_test_reflink _supported_os Linux _require_xfs_io_command "fiemap" diff --git a/tests/generic/802 b/tests/generic/802 index afd8513..51d3414 100755 --- a/tests/generic/802 +++ b/tests/generic/802 @@ -43,7 +43,7 @@ _cleanup() . ./common/filter # real QA test starts here -_supported_fs btrfs +_require_test_reflink _supported_os Linux _require_xfs_io_command "fiemap"
Modify the reflink tests to support xfs. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- common/rc | 37 +++++++++++++++++++++++++++++++++++++ tests/generic/800 | 2 +- tests/generic/801 | 2 +- tests/generic/802 | 2 +- 4 files changed, 40 insertions(+), 3 deletions(-) -- 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