dmlogwrites: skip generic tests when external logdev in use

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@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/common/rc b/common/rc
index f44694646c4790e55e95c668cbe00a0eecbe00d6..758584dc9998053fdc3e054e542472dfcdc99c5b 100644 (file)
--- 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 13d326e7edfa68cb8ee1e001d21db134d06fa976..649b54108770f009b1aaee876ee301e44e4a79ba 100755 (executable)
--- 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 7e0a31574c262803f4600aa37d0058b508b67160..da75798f117a453f973ca722816af353c3d9f630 100755 (executable)
--- 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 dd8525d7f1333b5d0485ebaf3f52d5a5cc94e5bd..f3407511166c19de8588a9685cb429111a559141 100755 (executable)
--- 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 c7e034d0ab47aaada468353b194285d777b70f7d..28c83a232e770ed8c16bc96ab4a671c573e8049a 100755 (executable)
--- 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