mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfs/realtime: Add require_no_realtime function
Some tests do not play well with realtime devices, in an effort to produce a stable set of test which exercise the realtime code paths we introduce a _require_no_realtime function to allow tests to opt out of realtime subvolume test runs. And to make tests generic/409-411 work well with rt device, teach _get_mount now honors $SCRATCH_OPTIONS. Signed-off-by: Richard Wareing <rwareing@fb.com> Reviewed-by: Eryu Guan <eguan@redhat.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
committed by
Eryu Guan
parent
7ae94a0462
commit
e3c3d46978
@@ -200,8 +200,14 @@ _mount()
|
|||||||
_get_mount()
|
_get_mount()
|
||||||
{
|
{
|
||||||
local mnt_point=${!#}
|
local mnt_point=${!#}
|
||||||
|
local mnt_dev=${@:(-2):1}
|
||||||
|
local scratch_opts=""
|
||||||
|
if [ "$mnt_dev" = "$SCRATCH_DEV" ]; then
|
||||||
|
_scratch_options mount
|
||||||
|
scratch_opts="$SCRATCH_OPTIONS"
|
||||||
|
fi
|
||||||
|
|
||||||
_mount $*
|
_mount $scratch_opts $*
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
MOUNTED_POINT_STACK="$mnt_point $MOUNTED_POINT_STACK"
|
MOUNTED_POINT_STACK="$mnt_point $MOUNTED_POINT_STACK"
|
||||||
else
|
else
|
||||||
@@ -232,7 +238,7 @@ _clear_mount_stack()
|
|||||||
|
|
||||||
_scratch_options()
|
_scratch_options()
|
||||||
{
|
{
|
||||||
type=$1
|
local type=$1
|
||||||
SCRATCH_OPTIONS=""
|
SCRATCH_OPTIONS=""
|
||||||
|
|
||||||
if [ "$FSTYP" != "xfs" ]; then
|
if [ "$FSTYP" != "xfs" ]; then
|
||||||
@@ -1761,6 +1767,14 @@ _require_realtime()
|
|||||||
_notrun "Realtime device required, skipped this test"
|
_notrun "Realtime device required, skipped this test"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# This test requires that a realtime subvolume is not in use
|
||||||
|
#
|
||||||
|
_require_no_realtime()
|
||||||
|
{
|
||||||
|
[ "$USE_EXTERNAL" = "yes" ] && [ -n "$SCRATCH_RTDEV" ] && \
|
||||||
|
_notrun "Test not compatible with realtime subvolumes, skipped this test"
|
||||||
|
}
|
||||||
|
|
||||||
# this test requires that a specified command (executable) exists
|
# this test requires that a specified command (executable) exists
|
||||||
# $1 - command, $2 - name for error message
|
# $1 - command, $2 - name for error message
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ _cleanup()
|
|||||||
|
|
||||||
_supported_fs xfs
|
_supported_fs xfs
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
# xfs_copy does not support realtime devices
|
||||||
|
_require_no_realtime
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_xfs_crc
|
_require_xfs_crc
|
||||||
_require_meta_uuid
|
_require_meta_uuid
|
||||||
|
|||||||
@@ -236,6 +236,7 @@ _putback_scratch_fstab()
|
|||||||
_supported_fs xfs
|
_supported_fs xfs
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
|
||||||
|
_require_no_realtime
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_noattr2
|
_require_noattr2
|
||||||
|
|
||||||
|
|||||||
@@ -49,6 +49,8 @@ rm -f $seqres.full
|
|||||||
# real QA test starts here
|
# real QA test starts here
|
||||||
_supported_fs xfs
|
_supported_fs xfs
|
||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
|
# xfs_copy does not support realtime devices
|
||||||
|
_require_no_realtime
|
||||||
_require_test
|
_require_test
|
||||||
_require_scratch
|
_require_scratch
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user