Split it from old testsets in generic/413 and xfs/260, since this
test need pmem device underneath has memory(struct page) backend.
We will _notrun the solo if the device is not compatible for the
test, preveting its confusing failure.
The other dax/nondax dio tests don't have this limitation.
Signed-off-by: Xiong Zhou <xzhou@xxxxxxxxxx>
---
tests/generic/413 | 13 +------------
tests/xfs/260 | 19 +++----------------
2 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/tests/generic/413 b/tests/generic/413
index a1cc514..32843d4 100755
--- a/tests/generic/413
+++ b/tests/generic/413
@@ -85,17 +85,6 @@ t_nondax_to_dax()
$SCRATCH_MNT/tf_d $1 "buffered nondax to dax"
}
-t_dax_to_nondax()
-{
- prep_files
- src/t_mmap_dio $SCRATCH_MNT/tf_s \
- $TEST_DIR/tf_d $1 "dio dax to nondax"
-
- prep_files
- src/t_mmap_dio -b $SCRATCH_MNT/tf_s \
- $TEST_DIR/tf_d $1 "buffered dax to nondax"
-}
-
t_both_nondax()
{
prep_files
@@ -109,8 +98,8 @@ t_both_nondax()
# $1 mmap read/write size
t_mmap_dio_dax()
{
+ # split t_dax_to_nondax to another case
t_both_dax $1
- t_dax_to_nondax $1
t_nondax_to_dax $1
t_both_nondax $1
}
diff --git a/tests/xfs/260 b/tests/xfs/260
index e613cc0..3066cb9 100755
--- a/tests/xfs/260
+++ b/tests/xfs/260
@@ -88,21 +88,6 @@ t_nondax_to_dax()
$1 "buffered nondax to dax"
}
-t_dax_to_nondax()
-{
- prep_files
- $XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
- $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
- src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
- $1 "dio dax to nondax"
-
- prep_files
- $XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
- $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
- src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
- $1 "buffered dax to nondax"
-}
-
t_both_nondax()
{
prep_files
@@ -119,8 +104,8 @@ t_both_nondax()
# $1 mmap read/write size
t_dax_flag_mmap_dio()
{
+ # split t_dax_to_nondax to another case
t_both_dax $1
- t_dax_to_nondax $1
t_nondax_to_dax $1
t_both_nondax $1
}
@@ -146,9 +131,11 @@ tsize=$((128 * 1024 * 1024))
do_tests
_scratch_unmount
+_check_scratch_fs
# mount again without dax option
export MOUNT_OPTIONS=""
+export TEST_FS_MOUNT_OPTS=""
_scratch_mount
do_tests
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
