aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiao Yang <yangx.jy@cn.fujitsu.com>2018-05-22 17:49:59 +0800
committerEryu Guan <guaneryu@gmail.com>2018-05-23 10:53:04 +0800
commit0ea7132607bb38c43fea4d6b0e98cdf5280ca21c (patch)
tree330bb81f2e274cac7d494db3b99baa9ac298ed9b
parentd84c105170190c20fa850f85f6630700101d1bf5 (diff)
downloadxfstests-dev-0ea7132607bb38c43fea4d6b0e98cdf5280ca21c.tar.gz
check: Make the test harness unmount fs when finishing a test
Finishing xfs/132 left a shutdown scratch fs and the test harness didn't unmount the fs(because we told it not to check the fs) so the test harness called by subsequent xfs/133 tried to "test -d $SCRATCH_MNT" and received the IO error from the dead fs. i.e. Running xfs/132 and xfs/133 together got the following error: ------------------------------------------------------------ ... xfs/132 1s ... 1s xfs/133 1s ... [failed, exit status 1] - output mismatch (see /var/lib/xfstests/results//xfs/133.out.bad) ... QA output created by 133 -Format and mount -Corrupt filesystem -Remount, try to append -Write did not succeed (ok). +SCRATCH_DEV=/dev/sda11 is mounted but not on SCRATCH_MNT=common/config: - aborting +Already mounted result: +/dev/sda11 /mnt/xfstests/scratch ... ------------------------------------------------------------ Even if we don't check fs, the test harness is supposed to unmount fs and return an initial state before running the next test. Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
-rwxr-xr-xcheck4
1 files changed, 4 insertions, 0 deletions
diff --git a/check b/check
index 96198ac471..f6fb352bcb 100755
--- a/check
+++ b/check
@@ -489,10 +489,14 @@ _check_filesystems()
if [ -f ${RESULT_DIR}/require_test ]; then
_check_test_fs || err=true
rm -f ${RESULT_DIR}/require_test*
+ else
+ _test_unmount 2> /dev/null
fi
if [ -f ${RESULT_DIR}/require_scratch ]; then
_check_scratch_fs || err=true
rm -f ${RESULT_DIR}/require_scratch*
+ else
+ _scratch_unmount 2> /dev/null
fi
}