fstests: _fail test by default when _scratch_mount fails

Previously _scratch_mount didn't check the mount status and most
tests continue to run even if the mount failed (unless test checks
for the mount status explicitly). This would result in running tests
on the underlying filesystem (usually rootfs) and implicit test
failures, and such failures can be annoying and are usually hard to
debug.

Now _fail test by default if _scratch_mount failed and introduce
_try_scratch_mount for tests that need to check mount results
themselves.

Suggested-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eryu Guan
2018-02-07 17:31:36 +08:00
parent 729381bda4
commit 69eb6281a9
109 changed files with 184 additions and 192 deletions
+2 -2
View File
@@ -61,12 +61,12 @@ run_check _scratch_mkfs "--nodesize $NODESIZE"
# result.
# discard error output since we will check return value manually.
# also disable all compression, or output will mismatch with golden output
_scratch_mount "-o noinode_cache,compress=no,compress-force=no" 2> /dev/null
_try_scratch_mount "-o noinode_cache,compress=no,compress-force=no" 2> /dev/null
# Check for old kernel which doesn't support 'noinode_cache' mount option
if [ $? -ne 0 ]; then
support_noinode_cache="no"
run_check _scratch_mount
_scratch_mount
fi
_run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv1