fstests: Make ./new work for non-root user

[xfstests-dev.git] / check

diff --git a/check b/check
index 96198ac4714ea574330ce08c7464e6e32ef13b23..a8cb7289b3208c9d16dd0c50cbc5ae9ae24f0ccd 100755 (executable)
--- a/check
+++ b/check
@@ -331,10 +331,10 @@ while [ $# -gt 0 ]; do
        shift
 done
 
-# we need common/config, source it after processing args, overlay needs FSTYP
-# set before sourcing common/config
-if ! . ./common/config; then
-       echo "$iam: failed to source common/config"
+# we need common/rc, that also sources common/config. We need to source it
+# after processing args, overlay needs FSTYP set before sourcing common/config
+if ! . ./common/rc; then
+       echo "check: failed to source common/rc"
        exit 1
 fi
 
@@ -374,13 +374,6 @@ elif [ -z "$GROUP_LIST" ]; then
        GROUP_LIST="auto"
 fi
 
-# we need common/rc
-if ! . ./common/rc
-then
-    echo "check: failed to source common/rc"
-    exit 1
-fi
-
 if [ `id -u` -ne 0 ]
 then
     echo "check: QA must be run as root"
@@ -489,10 +482,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
 }