diff mbox series

[19/24] xfs/424: disable external devices

Message ID 160013429643.2923511.17476130717295164051.stgit@magnolia
State Accepted
Headers show
Series fstests: tons of random fixes | expand

Commit Message

Darrick J. Wong Sept. 15, 2020, 1:44 a.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

This test uses an open-coded call to mkfs, so we need to disable the
external devices so that _scratch_xfs_db doesn't get confused.  We also
disable the post-check fsck because it's run by the parent ./check
program, which won't know that we didn't use the external devices.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/424 |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Christoph Hellwig Sept. 17, 2020, 7:59 a.m. UTC | #1
On Mon, Sep 14, 2020 at 06:44:56PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> This test uses an open-coded call to mkfs, so we need to disable the
> external devices so that _scratch_xfs_db doesn't get confused.  We also
> disable the post-check fsck because it's run by the parent ./check
> program, which won't know that we didn't use the external devices.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>
diff mbox series

Patch

diff --git a/tests/xfs/424 b/tests/xfs/424
index 66d79458..4907cf0f 100755
--- a/tests/xfs/424
+++ b/tests/xfs/424
@@ -47,7 +47,13 @@  rm -f $seqres.full
 # Modify as appropriate
 _supported_os Linux
 _supported_fs xfs
-_require_scratch
+
+# Since we have an open-coded mkfs call, disable the external devices and
+# don't let the post-check fsck actually run since it'll trip over us not
+# using the external devices.
+_require_scratch_nocheck
+export SCRATCH_LOGDEV=
+export SCRATCH_RTDEV=
 
 echo "Silence is golden."