From: Darrick J. Wong <djwong@kernel.org>
Date: Wed, 28 Jul 2021 00:09:48 +0000 (-0700)
Subject: check: don't leave the scratch filesystem mounted after _notrun
X-Git-Tag: v2022.05.01~310
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=057869ad38aeed3091df8a54c1de8db3a4aa7ed8;p=xfstests-dev.git

check: don't leave the scratch filesystem mounted after _notrun

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>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/check b/check
index bb7e030c..242cb8c1 100755
--- a/check
+++ b/check
@@ -871,6 +871,10 @@ 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
 			continue;
 		fi