apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

dax/dm: disable testing on devices that don't support dax

Browse Source 
Move the check for dax from the individual target scripts into
_require_dm_target.  This fixes up a couple of missed tests that are
failing due to the lack of dax support (such as tests requiring
dm-snapshot).

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Jeff Moyer
2020-02-20 15:06:30 -05:00
committed by Eryu Guan
parent 48045df9a8
commit fc7b390389
5 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/dmdelay
-5
View File
@@ -7,11 +7,6 @@
DELAY_NONE=0
DELAY_READ=1
echo $MOUNT_OPTIONS | grep -q dax
if [ $? -eq 0 ]; then
_notrun "Cannot run tests with DAX on dmdelay devices"
fi
_init_delay()
{
local BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
common/dmerror
-5
View File
@@ -4,11 +4,6 @@
#
# common functions for setting up and tearing down a dmerror device
echo $MOUNT_OPTIONS | grep -q dax
if [ $? -eq 0 ]; then
_notrun "Cannot run tests with DAX on dmerror devices"
fi
_dmerror_setup()
{
local dm_backing_dev=$SCRATCH_DEV
common/dmflakey
-5
View File
@@ -8,11 +8,6 @@ FLAKEY_ALLOW_WRITES=0
FLAKEY_DROP_WRITES=1
FLAKEY_ERROR_WRITES=2
echo $MOUNT_OPTIONS | grep -q dax
if [ $? -eq 0 ]; then
_notrun "Cannot run tests with DAX on dmflakey devices"
fi
_init_flakey()
{
local BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
common/dmthin
-5
View File
@@ -21,11 +21,6 @@ DMTHIN_POOL_DEV="/dev/mapper/$DMTHIN_POOL_NAME"
DMTHIN_VOL_NAME="thin-vol"
DMTHIN_VOL_DEV="/dev/mapper/$DMTHIN_VOL_NAME"
echo $MOUNT_OPTIONS | grep -q dax
if [ $? -eq 0 ]; then
_notrun "Cannot run tests with DAX on dmthin devices"
fi
_dmthin_cleanup()
{
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
common/rc
+11
View File
@@ -1874,6 +1874,17 @@ _require_dm_target()
_require_sane_bdev_flush $SCRATCH_DEV
_require_command "$DMSETUP_PROG" dmsetup
echo $MOUNT_OPTIONS | grep -q dax
if [ $? -eq 0 ]; then
case $target in
stripe|linear|log-writes)
;;
*)
_notrun "Cannot run tests with DAX on $target devices."
;;
esac
fi
modprobe dm-$target >/dev/null 2>&1
$DMSETUP_PROG targets 2>&1 | grep -q ^$target