xfstests: remove _require_no_rtinherit completely
PATCH 1/1 xfstests: remove _require_no_rtinherit completely
The _require_no_rtinherit has been removed by:
0ac0d8fb ("common: remove _require_no_rtinherit")
But some cases still remain the _require_no_rtinherit, so remove them all.
Signed-off-by Zorro Lang <[email protected]>
--- tests/generic/250 | 7 ++++--- tests/generic/252 | 6 +++--- tests/generic/441 | 7 ++++--- tests/generic/484 | 7 ++++--- tests/generic/487 | 7 ++++--- 5 files changed, 19 insertions(+), 15 deletions(-)
tests/generic/250 +4 -3
@@ -33,12 +33,13 @@ _require_scratch _require_dm_target error _require_xfs_io_command "falloc" _require_odirect -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV + fssize=$((196 * 1048576)) echo "Format and mount" $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
tests/generic/252 +3 -3
@@ -32,14 +32,14 @@ _cleanup() _require_scratch _require_dm_target error _require_xfs_io_command "falloc" -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit _require_aiodio "aiocp" AIO_TEST="$here/src/aio-dio-regress/aiocp" rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV fssize=$((196 * 1048576)) echo "Format and mount"
tests/generic/441 +4 -3
@@ -32,9 +32,6 @@ _cleanup() # real QA test starts here _require_scratch -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit # Generally, we want to avoid journal errors on the extended testcase. Only # unset the -s flag if we have a logdev
@@ -57,6 +54,10 @@ _require_test_program dmerror rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV + echo "Format and mount" _scratch_mkfs > $seqres.full 2>&1 _dmerror_init
tests/generic/484 +4 -3
@@ -37,14 +37,15 @@ _cleanup() # real QA test starts here _require_scratch_nocheck -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit _require_dm_target error _require_xfs_io_command "syncfs" rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV + echo "Format and mount" _scratch_mkfs > $seqres.full 2>&1 _dmerror_init
tests/generic/487 +4 -3
@@ -32,9 +32,6 @@ _cleanup() # real QA test starts here _require_scratch_nocheck -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit sflag='-s' case $FSTYP in
@@ -50,6 +47,10 @@ _require_dm_target error rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV + echo "Format and mount" _scratch_mkfs > $seqres.full 2>&1 _dmerror_init
Signature · 1 line
2.29.2
Quoted 7 lines · Zorro Lang
The
_require_no_rtinherithas been removed by:
0ac0d8fb("common: remove_require_no_rtinherit")But some cases still remain the
_require_no_rtinherit, so remove them all.Signed-off-by Zorro Lang <[email protected]>
Urrrrrrk, I didn't notice that this half of the removal ended up in the wrong patch. :(
Reviewed-by Darrick J. Wong <[email protected]>
--D
Quoted 127 lines
--- tests/generic/250 | 7 ++++--- tests/generic/252 | 6 +++--- tests/generic/441 | 7 ++++--- tests/generic/484 | 7 ++++--- tests/generic/487 | 7 ++++--- 5 files changed, 19 insertions(+), 15 deletions(-)tests/generic/250 +4
-3@@ -33,12 +33,13 @@ _require_scratch _require_dm_target error _require_xfs_io_command "falloc" _require_odirect -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV + fssize=$((196 * 1048576)) echo "Format and mount" $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.fulltests/generic/252 +3
-3@@ -32,14 +32,14 @@ _cleanup() _require_scratch _require_dm_target error _require_xfs_io_command "falloc" -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit _require_aiodio "aiocp" AIO_TEST="$here/src/aio-dio-regress/aiocp" rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV fssize=$((196 * 1048576)) echo "Format and mount"tests/generic/441 +4
-3@@ -32,9 +32,6 @@ _cleanup() # real QA test starts here _require_scratch -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit # Generally, we want to avoid journal errors on the extended testcase. Only # unset the -s flag if we have a logdev@@ -57,6 +54,10 @@ _require_test_program dmerror rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV + echo "Format and mount" _scratch_mkfs > $seqres.full 2>&1 _dmerror_inittests/generic/484 +4
-3@@ -37,14 +37,15 @@ _cleanup() # real QA test starts here _require_scratch_nocheck -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit _require_dm_target error _require_xfs_io_command "syncfs" rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV + echo "Format and mount" _scratch_mkfs > $seqres.full 2>&1 _dmerror_inittests/generic/487 +4
-3@@ -32,9 +32,6 @@ _cleanup() # real QA test starts here _require_scratch_nocheck -# This test uses "dm" without taking into account the data could be on -# realtime subvolume, thus the test will fail with rtinherit=1 -_require_no_rtinherit sflag='-s' case $FSTYP in@@ -50,6 +47,10 @@ _require_dm_target error rm -f $seqres.full +# Disable the scratch rt device to avoid test failures relating to the rt +# bitmap consuming all the free space in our small data device. +unset SCRATCH_RTDEV + echo "Format and mount" _scratch_mkfs > $seqres.full 2>&1 _dmerror_initSignature · 1 line
2.29.2