From: Hou Tao <houtao1@huawei.com>
Date: Sat, 29 Dec 2018 02:34:48 +0000 (+0800)
Subject: check: use _try_scratch_mount instead of _scratch_mount to mount SCRATCH_DEV
X-Git-Tag: v2022.05.01~1302
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3f95ea9fb3fd0c10330c4bd19f5c31f6cea42069;p=xfstests-dev.git

check: use _try_scratch_mount instead of _scratch_mount to mount SCRATCH_DEV

Else there won't be any error messages when mounting SCRATCH_DEV
failed, because _scratch_mount exits early by invoking _fail.

Signed-off-by: Hou Tao <houtao1@huawei.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/check b/check
index e85f40ac..e4d76737 100755
--- a/check
+++ b/check
@@ -607,7 +607,7 @@ for section in $HOST_OPTIONS_SECTIONS; do
 
 	  # call the overridden mount - make sure the FS mounts with
 	  # the same options that we'll mount with later.
-	  if ! _scratch_mount >$tmp.err 2>&1
+	  if ! _try_scratch_mount >$tmp.err 2>&1
 	  then
 	      echo "our local mount routine ..."
 	      cat $tmp.err