From: Darrick J. Wong <djwong@xxxxxxxxxx> Currently, dm-logwrites and common/dmlogwrites don't seem to have any means to coordinate the event numbers across multiple devices, and the fstests setup code is sufficiently intense that it doesn't seem like there's support for multi-disk filesystems. For now, we'll _notrun the tests when we have external log devices, even though that seems like something we'd _really_ want to test. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- common/rc | 8 ++++++++ tests/generic/455 | 1 + tests/generic/457 | 1 + tests/generic/470 | 1 + tests/generic/482 | 1 + 5 files changed, 12 insertions(+) diff --git a/common/rc b/common/rc index 60a9bacd..197c9415 100644 --- a/common/rc +++ b/common/rc @@ -2002,6 +2002,14 @@ _require_logdev() $UMOUNT_PROG $SCRATCH_LOGDEV 2>/dev/null } +# This test requires that an external log device is not in use +# +_require_no_logdev() +{ + [ "$USE_EXTERNAL" = "yes" ] && [ -n "$SCRATCH_LOGDEV" ] && \ + _notrun "Test not compatible with external logs, skipped this test" +} + # this test requires loopback device support # _require_loop() diff --git a/tests/generic/455 b/tests/generic/455 index 13d326e7..649b5410 100755 --- a/tests/generic/455 +++ b/tests/generic/455 @@ -25,6 +25,7 @@ _cleanup() _supported_fs generic _require_test _require_scratch_nocheck +_require_no_logdev _require_log_writes _require_dm_target thin-pool diff --git a/tests/generic/457 b/tests/generic/457 index 7e0a3157..da75798f 100755 --- a/tests/generic/457 +++ b/tests/generic/457 @@ -26,6 +26,7 @@ _cleanup() _supported_fs generic _require_test _require_scratch_reflink +_require_no_logdev _require_cp_reflink _require_log_writes _require_dm_target thin-pool diff --git a/tests/generic/470 b/tests/generic/470 index dd8525d7..f3407511 100755 --- a/tests/generic/470 +++ b/tests/generic/470 @@ -27,6 +27,7 @@ _cleanup() # real QA test starts here _supported_fs generic _require_scratch_nocheck +_require_no_logdev _require_log_writes_dax_mountopt "dax" _require_dm_target thin-pool _require_xfs_io_command "mmap" "-S" diff --git a/tests/generic/482 b/tests/generic/482 index c7e034d0..28c83a23 100755 --- a/tests/generic/482 +++ b/tests/generic/482 @@ -49,6 +49,7 @@ _cleanup() # Modify as appropriate. _supported_fs generic +_require_no_logdev _require_command "$KILLALL_PROG" killall # Use thin device as replay device, which requires $SCRATCH_DEV _require_scratch_nocheck