From: Darrick J. Wong <djwong@kernel.org>
Date: Tue, 26 Jul 2022 19:48:51 +0000 (-0700)
Subject: dmlogwrites: skip generic tests when external logdev in use
X-Git-Tag: xfs-zoned-old-2024-04-10~733
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=50f6d46410367586ab151b357e67393599eebd1c;p=users%2Fhch%2Fxfstests-dev.git

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 f44694646..758584dc9 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 13d326e7e..649b54108 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 7e0a31574..da75798f1 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 dd8525d7f..f34075111 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 c7e034d0a..28c83a232 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