linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, guaneryu@gmail.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me
Subject: [PATCH 2/4] check: don't leave the scratch filesystem mounted after _notrun
Date: Tue, 27 Jul 2021 17:09:48 -0700	[thread overview]
Message-ID: <162743098874.3427426.3383033227839715899.stgit@magnolia> (raw)
In-Reply-To: <162743097757.3427426.8734776553736535870.stgit@magnolia>

From: Darrick J. Wong <djwong@kernel.org>

Unmount the scratch filesystem if a test decides to _notrun itself
because _try_wipe_scratch_devs will not be able to wipe the scratch
device prior to the next test run.  We don't want to let scratch state
from one test leak into subsequent tests if we can help it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 check |    5 +++++
 1 file changed, 5 insertions(+)


diff --git a/check b/check
index bb7e030c..5d71b74c 100755
--- a/check
+++ b/check
@@ -871,6 +871,11 @@ function run_section()
 			notrun="$notrun $seqnum"
 			n_notrun=`expr $n_notrun + 1`
 			tc_status="notrun"
+
+			# Unmount the scratch fs so that we can wipe the scratch
+			# dev state prior to the next test run.
+			_scratch_unmount 2> /dev/null
+			rm -f ${RESULT_DIR}/require_scratch*
 			continue;
 		fi
 


  parent reply	other threads:[~2021-07-28  0:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-28  0:09 [PATCHSET 0/4] fstests: random fixes Darrick J. Wong
2021-07-28  0:09 ` [PATCH 1/4] xfs/106: fix golden output regression in quota off test Darrick J. Wong
2021-07-28  0:09 ` Darrick J. Wong [this message]
2021-08-01 13:02   ` [PATCH 2/4] check: don't leave the scratch filesystem mounted after _notrun Eryu Guan
2021-08-02 22:13     ` Darrick J. Wong
2021-07-28  0:09 ` [PATCH 3/4] generic/570: fix regression when SCRATCH_DEV is still formatted Darrick J. Wong
2021-08-01 13:08   ` Eryu Guan
2021-08-02 22:15     ` Darrick J. Wong
2021-07-28  0:09 ` [PATCH 4/4] check: back off the OOM score adjustment to -500 Darrick J. Wong
2021-07-28 20:00 ` [PATCH 5/4] xfs/530: skip test if user MKFS_OPTIONS screw up formatting Darrick J. Wong
2021-07-28 20:00 ` [PATCH 6/4] xfs/007: fix regressions on V4 filesystems Darrick J. Wong
2021-08-01 13:18 ` [PATCHSET 0/4] fstests: random fixes Eryu Guan

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=162743098874.3427426.3383033227839715899.stgit@magnolia \
    --to=djwong@kernel.org \
    --cc=fstests@vger.kernel.org \
    --cc=guan@eryu.me \
    --cc=guaneryu@gmail.com \
    --cc=linux-xfs@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).