tests: ts_mount validates error message

Skip only if mount reports a non-empty fs which is not available
in /proc/filesystems.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/functions.sh b/tests/functions.sh
index a1ed3ad221f7fdc968ed8dd95e03f507871f849a..cc3dc054aacd50708f0773aae1d17937eac470f3 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -495,14 +495,20 @@ function ts_mount {
        local out
        local result
        local msg
+       local fs
 
        out=$($TS_CMD_MOUNT "$@" 2>&1)
        result=$?
        echo -n "$out" >> $TS_OUTPUT
 
-       if [ $result != 0 ]; then
-               msg=$(echo "$out" | grep -m1 "unknown filesystem type") \
-                       && ts_skip "$msg"
+       if [ $result != 0 ] \
+               && msg=$(echo "$out" | grep -m1 "unknown filesystem type")
+       then
+               # skip only if reported fs correctly and if it's not available
+               fs=$(echo "$msg" | sed -n "s/.*type '\(.*\)'$/\1/p")
+               [ -n "$fs" ] \
+                && grep -qe "[[:space:]]${fs}$" /proc/filesystems &>/dev/null \
+                || ts_skip "$msg"
        fi
        return $result
 }