From: Zorro Lang <zlang@redhat.com>
Date: Wed, 27 Mar 2019 07:45:09 +0000 (+0800)
Subject: xfs/065: make sure SCRATCH_DEV is unmount before mkfs
X-Git-Tag: v2022.05.01~1208
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b0ef2879a77486b13ec7d8755f08722a79c36eb1;p=users%2Fhch%2Fxfstests-dev.git

xfs/065: make sure SCRATCH_DEV is unmount before mkfs

Commit "8309b39a fstests: fix broken _require_scratch usage" did
below change on xfs/065:

  -_scratch_unmount 2>/dev/null
  +_scratch_mkfs_xfs >> $seqres.full

It cause xfs/065 always fails now, as:
  QA output created by 065
  mkfs.xfs: /dev/sdb2 contains a mounted filesystem
  ...

So use _require_scratch, to make sure the SCRATCH_DEV is unmounted
before mkfs.

Signed-off-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/tests/xfs/065 b/tests/xfs/065
index c0d1ee93f..f09bd9473 100755
--- a/tests/xfs/065
+++ b/tests/xfs/065
@@ -50,6 +50,7 @@ _list_dir()
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_scratch
 
 #
 # too much hassle to get output matching with quotas turned on