From: Brian Foster <bfoster@redhat.com>
Date: Thu, 6 Jul 2017 18:06:20 +0000 (-0400)
Subject: xfs/297: fail test if _scratch_mount fails
X-Git-Tag: v2022.05.01~1973
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ab803945aec1d2110827d0eb3767d8c8db5335dd;p=users%2Fhch%2Fxfstests-dev.git

xfs/297: fail test if _scratch_mount fails

xfs/297 formats the scratch device with test specific mkfs options
that limit the use of certain mount options (i.e., if logbsize !=
256k). If an incompatible mount option is set, the mount fails but
the test proceeds to run against the root filesystem.

Update xfs/297 to fail if the mount of the scratch device fails for
whatever reason.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/tests/xfs/297 b/tests/xfs/297
index fe924413a..9accffd46 100755
--- a/tests/xfs/297
+++ b/tests/xfs/297
@@ -52,7 +52,7 @@ _require_command "$KILLALL_PROG" killall
 
 rm -f $seqres.full
 _scratch_mkfs_xfs -d agcount=16,su=256k,sw=12 -l su=256k,size=5120b >/dev/null 2>&1
-_scratch_mount >/dev/null 2>&1
+_scratch_mount >>$seqres.full 2>&1 || _fail "mount failed"
 
 STRESS_DIR="$SCRATCH_MNT/testdir"
 mkdir -p $STRESS_DIR