shared,ext4: move ext4-specific tests out of shared/
PATCH v2 1/5 shared,ext4: move ext4-specific tests out of shared/
The tests shared/{001,003,004,272} test behaviour around the ext4's journal. As such, they are pointless to run on ext2, and ext3 no longer is in kernels newer than 4.3. (And most enterprise distributions have been using ext4 to support the ext3 file system; that capability has been around since 2.6.33.) So we can move these tests out of shared and into the ext4 class of tests:
shared/001 --> ext4/036 shared/003 --> ext4/037 shared/004 --> ext4/038 shared/272 --> ext4/039
---
Changes since v1:
- Adjusted _supported_fs lines
tests/{shared/001 => ext4/036} | 6 +++---
tests/ext4/036.out | 2 ++
tests/{shared/003 => ext4/037} | 6 ++----
tests/ext4/037.out | 2 ++
tests/{shared/004 => ext4/038} | 4 ++--
tests/ext4/038.out | 2 ++
tests/{shared/272 => ext4/039} | 2 +-
tests/{shared/272.out => ext4/039.out} | 2 +-
tests/ext4/group | 4 ++++
tests/shared/001.out | 2 --
tests/shared/003.out | 2 --
tests/shared/004.out | 2 --
tests/shared/group | 4 ----
13 files changed, 19 insertions(+), 21 deletions(-)
rename tests/{shared/001 => ext4/036} (90%)
create mode 100644 tests/ext4/036.out
rename tests/{shared/003 => ext4/037} (93%)
create mode 100644 tests/ext4/037.out
rename tests/{shared/004 => ext4/038} (94%)
create mode 100644 tests/ext4/038.out
rename tests/{shared/272 => ext4/039} (97%)
rename tests/{shared/272.out => ext4/039.out} (72%)
delete mode 100644 tests/shared/001.out
delete mode 100644 tests/shared/003.out
delete mode 100644 tests/shared/004.outtests/ext4/036 renamed from tests/shared/001 +3 -3
@@ -2,9 +2,9 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Red Hat Inc. All Rights Reserved. # -# FS QA Test No. 001 +# FS QA Test No. ext4/036 (was shared/001) # -# Test truncate orphan inodes when mounting extN. +# Test truncate orphan inodes when mounting ext4 # ext4 used to hit WARNING, this commit fixed the issue # # 721e3eb ext4: lock i_mutex when truncating orphan inodes
@@ -29,7 +29,7 @@ _cleanup() . ./common/filter # real QA test starts here -_supported_fs ext2 ext3 ext4 +_supported_fs ext3 ext4 _supported_os Linux _require_scratch
tests/ext4/036.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 036 +Silence is golden
tests/ext4/037 renamed from tests/shared/003 +2 -4
@@ -2,15 +2,13 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2015 Red Hat Inc. All Rights Reserved. # -# FS QA Test 003 +# FS QA Test ext4/037 (was shared/003) # # Test mount a needs_recovery partition with noload option. # ext4 used to Oops until part of this commit: # # 744692d ext4: use ext4_get_block_write in buffer write # -# Also test on ext2/3. -# seq=`basename $0` seqres=$RESULT_DIR/$seq echo "QA output created by $seq"
@@ -31,7 +29,7 @@ _cleanup() . ./common/filter # real QA test starts here -_supported_fs ext2 ext3 ext4 +_supported_fs ext3 ext4 _supported_os Linux # nofsck as we modify sb via debugfs
tests/ext4/037.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 037 +Silence is golden
tests/ext4/038 renamed from tests/shared/004 +2 -2
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2016 Fujitsu. All Rights Reserved. # -# FS QA Test 004 +# FS QA Test ext4/038 (was shared/004) # # Regression test for commit: # c9eb13a ext4: fix hang when processing corrupted orphaned inode list
@@ -25,7 +25,7 @@ _cleanup() . ./common/rc # real QA test starts here -_supported_fs ext2 ext3 ext4 +_supported_fs ext3 ext4 _supported_os Linux _require_scratch _require_command "$DEBUGFS_PROG" debugfs
tests/ext4/038.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 038 +Silence is golden
tests/ext4/039 renamed from tests/shared/272 +1 -1
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2006 Silicon Graphics, Inc. All Rights Reserved. # -# FSQA Test No. 272 +# FSQA Test No. ext4/039 (was shared/272) # # Test data journaling flag switch for a single file #
tests/ext4/039.out renamed from tests/shared/272.out +1 -1
@@ -1,3 +1,3 @@ -QA output created by 272 +QA output created by 039 Switch data journalling mode. Silence is golden. Check filesystem
tests/ext4/group +4 -0
@@ -38,6 +38,10 @@ 033 auto ioctl resize 034 auto quick quota 035 auto quick resize +036 auto quick +037 auto quick +038 auto quick +039 auto enospc rw 271 auto rw quick 301 aio auto ioctl rw stress defrag 302 aio auto ioctl rw stress defrag
tests/shared/001.out deleted +0 -2
@@ -1,2 +0,0 @@ -QA output created by 001 -Silence is golden
tests/shared/003.out deleted +0 -2
@@ -1,2 +0,0 @@ -QA output created by 003 -Silence is golden
tests/shared/004.out deleted +0 -2
@@ -1,2 +0,0 @@ -QA output created by 004 -Silence is golden
tests/shared/group +0 -4
@@ -3,10 +3,7 @@ # - do not start group names with a digit # - comment line before each group is "new" description # -001 auto quick 002 auto metadata quick log -003 auto quick -004 auto quick 005 dangerous_fuzzers 006 auto enospc 007 dangerous_fuzzers
@@ -15,6 +12,5 @@ 010 auto stress dedupe 011 auto quick 032 mkfs auto quick -272 auto enospc rw 289 auto quick 298 auto trim
Signature · 1 line
2.22.0
PATCH v2 2/5 check: add ext4 group list when testing ext2 and ext3
Modern kernels use the ext4 implementation to support ext2 and ext3 mounts, and a number of the ext4 tests are actually suitable for ext2 and ext3. We're trying to move tests out of shared anyway, so instead of moving tests from ext4/NNN to shared, let's just include the ext4 group list when FSTYP is ext2 or ext3.
---
Changes since v1:
- none
check | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
check +5 -1
@@ -130,6 +130,7 @@ get_group_list() local grp=$1 local grpl="" local sub=$(dirname $grp) + local fsgroup="$FSTYP" if [ -n "$sub" -a "$sub" != "." -a -d "$SRC_DIR/$sub" ]; then # group is given as <subdir>/<group> (e.g. xfs/quick)
@@ -138,7 +139,10 @@ get_group_list() return fi - for d in $SRC_GROUPS $FSTYP; do + if [ "$FSTYP" = ext2 -o "$FSTYP" = ext3 ]; then + fsgroup=ext4 + fi + for d in $SRC_GROUPS $fsgroup; do if ! test -d "$SRC_DIR/$d" ; then continue fi
Signature · 1 line
2.22.0
PATCH v2 3/5 shared,ext4: move ext[234]-specific tests out of shared/
In reply to Theodore Ts'oMove the following tests:
shared/005 --> ext4/040 shared/007 --> ext4/041 shared/289 --> ext4/042
---
Changes since v1:
- none
tests/{shared/005 => ext4/040} | 2 +-
tests/{shared/007.out => ext4/040.out} | 2 +-
tests/{shared/007 => ext4/041} | 2 +-
tests/{shared/005.out => ext4/041.out} | 2 +-
tests/{shared/289 => ext4/042} | 2 +-
tests/{shared/289.out => ext4/042.out} | 2 +-
tests/ext4/group | 3 +++
tests/shared/group | 3 ---
8 files changed, 9 insertions(+), 9 deletions(-)
rename tests/{shared/005 => ext4/040} (97%)
rename tests/{shared/007.out => ext4/040.out} (77%)
rename tests/{shared/007 => ext4/041} (97%)
rename tests/{shared/005.out => ext4/041.out} (77%)
rename tests/{shared/289 => ext4/042} (98%)
rename tests/{shared/289.out => ext4/042.out} (67%)tests/ext4/040 renamed from tests/shared/005 +1 -1
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2017 Oracle, Inc. All Rights Reserved. # -# FSQA Test No. 005 +# FSQA Test No. ext4/040 (was shared/005) # # Since loff_t is a signed type, it is invalid for a filesystem to load # an inode with i_size = -1ULL. Unfortunately, nobody checks this,
tests/ext4/040.out renamed from tests/shared/007.out +1 -1
@@ -1,4 +1,4 @@ -QA output created by 007 +QA output created by 040 Format and mount Corrupt filesystem Remount, try to append
tests/ext4/041 renamed from tests/shared/007 +1 -1
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2017 Oracle, Inc. All Rights Reserved. # -# FSQA Test No. 007 +# FSQA Test No. ext4/041 (was shared/007) # # Since loff_t is a signed type, it is invalid for a filesystem to load # an inode with i_size = -1ULL. Unfortunately, nobody checks this,
tests/ext4/041.out renamed from tests/shared/005.out +1 -1
@@ -1,4 +1,4 @@ -QA output created by 005 +QA output created by 041 Format and mount Corrupt filesystem Remount, try to append
tests/ext4/042 renamed from tests/shared/289 +1 -1
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2012 Red Hat, Inc. All Rights Reserved. # -# FS QA Test No. 289 +# FS QA Test No. ext4/042 (was shared/289) # # Test overhead & df output for extN filesystems #
tests/ext4/042.out renamed from tests/shared/289.out +1 -1
@@ -1,3 +1,3 @@ -QA output created by 289 +QA output created by 042 minix f_blocks is in range bsd f_blocks is in range
tests/ext4/group +3 -0
@@ -42,6 +42,9 @@ 037 auto quick 038 auto quick 039 auto enospc rw +040 dangerous_fuzzers +041 dangerous_fuzzers +042 auto quick 271 auto rw quick 301 aio auto ioctl rw stress defrag 302 aio auto ioctl rw stress defrag
tests/shared/group +0 -3
@@ -4,13 +4,10 @@ # - comment line before each group is "new" description # 002 auto metadata quick log -005 dangerous_fuzzers 006 auto enospc -007 dangerous_fuzzers 008 auto stress dedupe 009 auto stress dedupe 010 auto stress dedupe 011 auto quick 032 mkfs auto quick -289 auto quick 298 auto trim
Signature · 1 line
2.22.0
PATCH v2 4/5 shared,generic: move shared/006 to generic/
In reply to Theodore Ts'oThe shared/006 uses _scratch_mkfs_sized to create a limited size file system, and then creates inodes until it gets ENOSPC, and then checks to make sure the file system is consistent. It then remounts the file system, removes all of the files, and makes sure the file system is consistent afterwards.
This test was marked as only being supported on ext[234] and xfs, and so it was in shared. However, I've tested and this test works just fine on btrfs, ubifs, tmpfs, and should work on all file systems that support _scratch_mkfs_sized, since even if there isn't a fixed inode table, the file system will eventually run out of disk space.
---
Changes since v1:
- added a new _require_scratch_inode_limits and use it for generic/558
- added missing "_supported_fs generic" line
common/rc | 11 +++++++++++
tests/{shared/006 => generic/558} | 7 +++----
tests/generic/558.out | 2 ++
tests/generic/group | 1 +
tests/shared/006.out | 2 --
tests/shared/group | 1 -
6 files changed, 17 insertions(+), 7 deletions(-)
rename tests/{shared/006 => generic/558} (95%)
create mode 100644 tests/generic/558.out
delete mode 100644 tests/shared/006.outcommon/rc +11 -0
@@ -4147,6 +4147,17 @@ _require_scratch_btime() _scratch_unmount } +_require_scratch_inode_limits() +{ + _require_scratch + _scratch_mkfs > /dev/null 2>&1 + _scratch_mount + if [ $(_get_free_inode $SCRATCH_MNT) -eq 0 ]; then + _notrun "$FSTYP does not have a fixed number of inodes available" + fi + _scratch_unmount +} + _require_filefrag_options() { _require_command "$FILEFRAG_PROG" filefrag
tests/generic/558 renamed from tests/shared/006 +3 -4
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2014 Red Hat Inc. All Rights Reserved. # -# FS QA Test No. shared/006 +# FS QA Test No. generic/558 # # Stress test fs by using up all inodes and check fs. #
@@ -42,10 +42,9 @@ create_file() . ./common/filter # real QA test starts here -_supported_fs ext4 ext3 ext2 xfs +_supported_fs generic _supported_os Linux - -_require_scratch +_require_scratch_inode_limits rm -f $seqres.full echo "Silence is golden"
tests/generic/558.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 558 +Silence is golden
tests/generic/group +1 -0
@@ -560,3 +560,4 @@ 555 auto quick cap 556 auto quick casefold 557 auto quick log +558 auto enospc
tests/shared/006.out deleted +0 -2
@@ -1,2 +0,0 @@ -QA output created by 006 -Silence is golden
tests/shared/group +0 -1
@@ -4,7 +4,6 @@ # - comment line before each group is "new" description # 002 auto metadata quick log -006 auto enospc 008 auto stress dedupe 009 auto stress dedupe 010 auto stress dedupe
Signature · 1 line
2.22.0
Re: [PATCH v2 4/5] shared,generic: move shared/006 to generic/
Quoted 37 lines · Theodore Ts'o
The shared/006 uses
_scratch_mkfs_sizedto create a limited size file system, and then creates inodes until it gets ENOSPC, and then checks to make sure the file system is consistent. It then remounts the file system, removes all of the files, and makes sure the file system is consistent afterwards.This test was marked as only being supported on ext[234] and xfs, and so it was in shared. However, I've tested and this test works just fine on btrfs, ubifs, tmpfs, and should work on all file systems that support
_scratch_mkfs_sized, since even if there isn't a fixed inode table, the file system will eventually run out of disk space.Signed-off-by Theodore Ts'o <[email protected]>---
Changes since v1:
- added a new_require_scratch_inode_limitsand use it for generic/558
- added missing "_supported_fsgeneric" linecommon/rc | 11 +++++++++++ tests/{shared/006 => generic/558} | 7 +++---- tests/generic/558.out | 2 ++ tests/generic/group | 1 + tests/shared/006.out | 2 -- tests/shared/group | 1 - 6 files changed, 17 insertions(+), 7 deletions(-) rename tests/{shared/006 => generic/558} (95%) create mode 100644 tests/generic/558.out delete mode 100644 tests/shared/006.outcommon/rc +0
-0@@ -4147,6 +4147,17 @@ _require_scratch_btime() _scratch_unmount }
common/rc _require_scratch_btime() · line 4159
Quoted 10 lines
common/rc +10
-0+_require_scratch_inode_limits() +{ + _require_scratch + _scratch_mkfs > /dev/null 2>&1 + _scratch_mount + if [ $(_get_free_inode $SCRATCH_MNT) -eq 0 ]; then + _notrun "$FSTYP does not have a fixed number of inodes available" + fi + _scratch_unmount +}
I think testing against $TEST_DIR should be sufficient, so we could avoid the mkfs & mount & umount SCRATCH_DEV time. i.e.
_require_inode_limits()
{
if [ $(_get_free_inode $TEST_DIR) -eq 0 ]; then
_notrun "$FSTYP does not have a fixed number of inodes available"
fi
}
If this looks reasonable, I can fix it on commit.
Thanks,
Eryu
Quoted 73 lines
common/rc +1
-0+ _require_filefrag_options() { _require_command "$FILEFRAG_PROG" filefragtests/generic/558 renamed from tests/shared/006 +3
-4@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2014 Red Hat Inc. All Rights Reserved. # -# FS QA Test No. shared/006 +# FS QA Test No. generic/558 # # Stress test fs by using up all inodes and check fs. #@@ -42,10 +42,9 @@ create_file() . ./common/filter # real QA test starts here -_supported_fs ext4 ext3 ext2 xfs +_supported_fs generic _supported_os Linux - -_require_scratch +_require_scratch_inode_limits rm -f $seqres.full echo "Silence is golden"tests/generic/558.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 558 +Silence is goldentests/generic/group +1
-0@@ -560,3 +560,4 @@ 555 auto quick cap 556 auto quick casefold 557 auto quick log +558 auto enospctests/shared/006.out deleted +0
-2@@ -1,2 +0,0 @@ -QA output created by 006 -Silence is goldentests/shared/group +0
-1@@ -4,7 +4,6 @@ # - comment line before each group is "new" description # 002 auto metadata quick log -006 auto enospc 008 auto stress dedupe 009 auto stress dedupe 010 auto stress dedupeSignature · 1 line
2.22.0
Re: [PATCH v2 4/5] shared,generic: move shared/006 to generic/
Quoted 5 lines · Eryu Guan
Quoted 5 lines
common/rc +5
-0+_require_scratch_inode_limits() +{ + _require_scratch + _scratch_mkfs > /dev/null 2>&1 + _scratch_mount
Quoted 8 lines
common/rc _require_scratch_btime() · line 4159
Quoted 5 lines
common/rc +5
-0+ if [ $(_get_free_inode $SCRATCH_MNT) -eq 0 ]; then + _notrun "$FSTYP does not have a fixed number of inodes available" + fi + _scratch_unmount +}I think testing against $TEST_DIR should be sufficient, so we could avoid the mkfs & mount & umount
SCRATCH_DEVtime.
I was following the pattern that I saw with other similar _require tests (for example: _require_scratch_shutdown). I *thought* the reason why this is was done is because if the test only uses the SCRATCH_DEV, there's no making it a requirement that TEST_DEV be available --- since IIRC, we do support SCRATCH_DEV being available, but not TEST_DEV.
I personally don't use xfstests in that way --- when I run xfstests, TEST_DEV is always available and in some cases, SCRATCH_DEV won't be present. But I thought that's why _require_test exists --- so that tests can be skipped if TEST_DEV does not exist.
- Ted
Re: [PATCH v2 4/5] shared,generic: move shared/006 to generic/
Quoted 22 lines · Theodore Ts'o
Quoted 5 lines · Eryu Guan
Quoted 5 lines
common/rc +5
-0+_require_scratch_inode_limits() +{ + _require_scratch + _scratch_mkfs > /dev/null 2>&1 + _scratch_mountQuoted 8 lines
common/rc _require_scratch_btime() · line 4159
Quoted 5 lines
common/rc +5
-0+ if [ $(_get_free_inode $SCRATCH_MNT) -eq 0 ]; then + _notrun "$FSTYP does not have a fixed number of inodes available" + fi + _scratch_unmount +}I think testing against $TEST_DIR should be sufficient, so we could avoid the mkfs & mount & umount
SCRATCH_DEVtime.I was following the pattern that I saw with other similar
_requiretests (for example:_require_scratch_shutdown). I *thought* the reason why this is was done is because if the test only uses theSCRATCH_DEV, there's no making it a requirement thatTEST_DEVbe available --- since IIRC, we do supportSCRATCH_DEVbeing available, but notTEST_DEV.
Quoted 4 lines
I personally don't use xfstests in that way --- when I run xfstests,
TEST_DEVis always available and in some cases,SCRATCH_DEVwon't be present. But I thought that's why_require_testexists --- so that tests can be skipped ifTEST_DEVdoes not exist.
xfstests assumes TEST_DEV is always present and SCRATCH_DEV is optional (but recommended). _require_test not only checks if TEST_DEV is avaiable & properly mounted but also implies we should do fsck against TEST_DEV after test, as _require_test does "touch ${RESULT_DIR}/require_test" as well.
Regarding to _require_scratch_xxx, that's usually because the requirement being checked might change when mkfs with different options. But a filesystem will always have a fixed number of inodes no matter what mkfs options it uses (the same is true for not having a fixed number of inodes). So in this case, I think check against TEST_DEV/TEST_DIR should be fine.
Thanks,
Eryu
PATCH v2 5/5 shared,generic: move tests using duperemove to generic/
In reply to Theodore Ts'oAdd _require_scratch_duperemove which validates that the file system supports duperemove. This allows us to move three tests from shared/ to generic/. This means these tests will automatically adapt when duperemove supports other file systems. Tests moved are:
shared/008 --> generic/559 shared/009 --> generic/560 shared/010 --> generic/561
---
Changes since v1:
- added missing "_supported_fs generic" lines
common/reflink | 18 ++++++++++++++++++
tests/{shared/008 => generic/559} | 10 ++++------
tests/{shared/008.out => generic/559.out} | 2 +-
tests/{shared/009 => generic/560} | 10 +++-------
tests/{shared/009.out => generic/560.out} | 2 +-
tests/{shared/010 => generic/561} | 10 +++-------
tests/generic/561.out | 2 ++
tests/generic/group | 3 +++
tests/shared/010.out | 2 --
tests/shared/group | 3 ---
10 files changed, 35 insertions(+), 27 deletions(-)
rename tests/{shared/008 => generic/559} (85%)
rename tests/{shared/008.out => generic/559.out} (64%)
rename tests/{shared/009 => generic/560} (91%)
rename tests/{shared/009.out => generic/560.out} (74%)
rename tests/{shared/010 => generic/561} (89%)
create mode 100644 tests/generic/561.out
delete mode 100644 tests/shared/010.outcommon/reflink +18 -0
@@ -75,6 +75,24 @@ _require_scratch_reflink() _scratch_unmount } +# this test requires duperemove working for the file system +_require_scratch_duperemove() +{ + _require_scratch + _require_command "$DUPEREMOVE_PROG" duperemove + + _scratch_mkfs > /dev/null + _scratch_mount + dd if=/dev/zero of="$SCRATCH_MNT/file1" bs=128k count=1 >& /dev/null + dd if=/dev/zero of="$SCRATCH_MNT/file2" bs=128k count=1 >& /dev/null + if ! "$DUPEREMOVE_PROG" -d "$SCRATCH_MNT/file1" \ + "$SCRATCH_MNT/file2" >& /dev/null ; then + _scratch_unmount + _notrun "duperemove does not support file system type: $FSTYP" + fi + _scratch_unmount +} + # this test requires scratch fs to report explicit SHARED flag # e.g. # 0 4K 8K
tests/generic/559 renamed from tests/shared/008 +4 -6
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2018 Red Hat Inc. All Rights Reserved. # -# FS QA Test 008 +# FS QA Test generic/559 (was shared/008) # # Dedupe a single big file and verify integrity #
@@ -29,12 +29,10 @@ _cleanup() # remove previous $seqres.full before test rm -f $seqres.full -# duperemove only supports btrfs and xfs (with reflink feature). -# Add other filesystems if it supports more later. -_supported_fs xfs btrfs +# real QA test starts here +_supported_fs generic _supported_os Linux -_require_scratch_dedupe -_require_command "$DUPEREMOVE_PROG" duperemove +_require_scratch_duperemove fssize=$((2 * 1024 * 1024 * 1024)) _scratch_mkfs_sized $fssize > $seqres.full 2>&1
tests/generic/559.out renamed from tests/shared/008.out +1 -1
@@ -1,3 +1,3 @@ -QA output created by 008 +QA output created by 559 = before cycle mount = = after cycle mount =
tests/generic/560 renamed from tests/shared/009 +3 -7
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2018 Red Hat Inc. All Rights Reserved. # -# FS QA Test 009 +# FS QA Test generic/560 (was shared/009) # # Iterate dedupe integrity test. Copy an original data0 several # times (d0 -> d1, d1 -> d2, ... dn-1 -> dn), dedupe dataN everytime
@@ -32,13 +32,9 @@ _cleanup() rm -f $seqres.full # real QA test starts here - -# duperemove only supports btrfs and xfs (with reflink feature). -# Add other filesystems if it supports more later. -_supported_fs xfs btrfs +_supported_fs generic _supported_os Linux -_require_scratch_dedupe -_require_command "$DUPEREMOVE_PROG" duperemove +_require_scratch_duperemove _scratch_mkfs > $seqres.full 2>&1 _scratch_mount >> $seqres.full 2>&1
tests/generic/560.out renamed from tests/shared/009.out +1 -1
@@ -1,4 +1,4 @@ -QA output created by 009 +QA output created by 560 = Do dedup and verify = = Backwords verify = = Verify after cycle mount =
tests/generic/561 renamed from tests/shared/010 +3 -7
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2018 Red Hat Inc. All Rights Reserved. # -# FS QA Test 010 +# FS QA Test generic/561 (was shared/010) # # Dedup & random I/O race test, do multi-threads fsstress and dedupe on # same directory/files
@@ -32,13 +32,9 @@ _cleanup() rm -f $seqres.full # real QA test starts here - -# duperemove only supports btrfs and xfs (with reflink feature). -# Add other filesystems if it supports more later. -_supported_fs xfs btrfs +_supported_fs generic _supported_os Linux -_require_scratch_dedupe -_require_command "$DUPEREMOVE_PROG" duperemove +_require_scratch_duperemove _require_command "$KILLALL_PROG" killall _scratch_mkfs > $seqres.full 2>&1
tests/generic/561.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 561 +Silence is golden
tests/generic/group +3 -0
@@ -561,3 +561,6 @@ 556 auto quick casefold 557 auto quick log 558 auto enospc +559 auto stress dedupe +560 auto stress dedupe +561 auto stress dedupe
tests/shared/010.out deleted +0 -2
@@ -1,2 +0,0 @@ -QA output created by 010 -Silence is golden
tests/shared/group +0 -3
@@ -4,9 +4,6 @@ # - comment line before each group is "new" description # 002 auto metadata quick log -008 auto stress dedupe -009 auto stress dedupe -010 auto stress dedupe 011 auto quick 032 mkfs auto quick 298 auto trim
Signature · 1 line
2.22.0