All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zorro Lang <zlang@redhat.com>
To: fstests@vger.kernel.org
Subject: [PATCH] xfstests: remove _require_no_rtinherit completely
Date: Mon,  1 Mar 2021 09:46:03 +0800	[thread overview]
Message-ID: <20210301014603.147159-1-zlang@redhat.com> (raw)

The _require_no_rtinherit has been removed by:
  0ac0d8fb ("common: remove _require_no_rtinherit")

But some cases still remain the _require_no_rtinherit, so remove
them all.

Signed-off-by: Zorro Lang <zlang@redhat.com>
---
 tests/generic/250 | 7 ++++---
 tests/generic/252 | 6 +++---
 tests/generic/441 | 7 ++++---
 tests/generic/484 | 7 ++++---
 tests/generic/487 | 7 ++++---
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/tests/generic/250 b/tests/generic/250
index eaa2f884..102bf500 100755
--- a/tests/generic/250
+++ b/tests/generic/250
@@ -33,12 +33,13 @@ _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"
 _require_odirect
-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit
 
 rm -f $seqres.full
 
+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
+
 fssize=$((196 * 1048576))
 echo "Format and mount"
 $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
diff --git a/tests/generic/252 b/tests/generic/252
index 61369759..809e8020 100755
--- a/tests/generic/252
+++ b/tests/generic/252
@@ -32,14 +32,14 @@ _cleanup()
 _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"
-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit
 _require_aiodio "aiocp"
 AIO_TEST="$here/src/aio-dio-regress/aiocp"
 
 rm -f $seqres.full
 
+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
 
 fssize=$((196 * 1048576))
 echo "Format and mount"
diff --git a/tests/generic/441 b/tests/generic/441
index 6ad449bb..bedbcb08 100755
--- a/tests/generic/441
+++ b/tests/generic/441
@@ -32,9 +32,6 @@ _cleanup()
 
 # real QA test starts here
 _require_scratch
-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit
 
 # Generally, we want to avoid journal errors on the extended testcase. Only
 # unset the -s flag if we have a logdev
@@ -57,6 +54,10 @@ _require_test_program dmerror
 
 rm -f $seqres.full
 
+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
+
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init
diff --git a/tests/generic/484 b/tests/generic/484
index ad39e45b..331cd1ad 100755
--- a/tests/generic/484
+++ b/tests/generic/484
@@ -37,14 +37,15 @@ _cleanup()
 
 # real QA test starts here
 _require_scratch_nocheck
-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit
 _require_dm_target error
 _require_xfs_io_command "syncfs"
 
 rm -f $seqres.full
 
+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
+
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init
diff --git a/tests/generic/487 b/tests/generic/487
index 197b2385..1aa97ada 100755
--- a/tests/generic/487
+++ b/tests/generic/487
@@ -32,9 +32,6 @@ _cleanup()
 
 # real QA test starts here
 _require_scratch_nocheck
-# This test uses "dm" without taking into account the data could be on
-# realtime subvolume, thus the test will fail with rtinherit=1
-_require_no_rtinherit
 
 sflag='-s'
 case $FSTYP in
@@ -50,6 +47,10 @@ _require_dm_target error
 
 rm -f $seqres.full
 
+# Disable the scratch rt device to avoid test failures relating to the rt
+# bitmap consuming all the free space in our small data device.
+unset SCRATCH_RTDEV
+
 echo "Format and mount"
 _scratch_mkfs > $seqres.full 2>&1
 _dmerror_init
-- 
2.29.2


             reply	other threads:[~2021-03-01  1:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-01  1:46 Zorro Lang [this message]
2021-03-01 16:22 ` [PATCH] xfstests: remove _require_no_rtinherit completely Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210301014603.147159-1-zlang@redhat.com \
    --to=zlang@redhat.com \
    --cc=fstests@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.