X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=74cff3f7661adcb916a9a83ee46753ce3633a96b;hb=051a59e4c6d114fc7abfa14ff78436adab5defb9;hp=cd3317afc1ba554527563a1a7a7125439fe7c182;hpb=54193a504d8dcf1e2dfae727c76cd1b44884518b;p=wimlib

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index cd3317af..74cff3f7 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -1,11 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Test WIM mounting
 
 set -e
-srcdir=${srcdir:-.}
-srcdir=`realpath $srcdir`
 cd tests
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
+
+if [ ! -r /dev/fuse ]; then
+	echo "WARNING: /dev/fuse is not readable."
+	echo "Skipping WIM mounting checks"
+	exit 0
+fi
 
 imagex() {
 	echo "imagex $@"
@@ -27,14 +33,10 @@ imagex_mountrw() {
 }
 
 cleanup() {
-	if mountpoint tmp &> /dev/null; then
-		fusermount -u tmp > /dev/null;
-	fi
-	if mountpoint tmp.mnt &> /dev/null; then
-		fusermount -u tmp.mnt > /dev/null;
-	fi
+	fusermount -u tmp &> /dev/null || true
+	fusermount -u tmp.mnt &> /dev/null || true
 	rm -rf dir* tmp* *.wim *.swm empty.wim tmp.orig tmp.mnt \
-			tmp.apply mount.log
+			tmp.apply mount.log test.tar wimlib-staging*
 }
 init() {
 	mkdir dir
@@ -54,10 +56,13 @@ init() {
 }
 
 error() {
-	echo "**********************************************"
-	echo "                  Test failure                "
-	echo $*
-	echo "**********************************************"
+	echo "****************************************************************"
+	echo "                         Test failure                           "
+	while [ $# -gt 0 ]; do
+		echo $1
+		shift
+	done
+	echo "****************************************************************"
 	exit 1
 }
 
@@ -74,7 +79,10 @@ for flag in "--compress=none" "--compress=maximum" "--compress=fast"; do
 	fi
 	mkdir tmp
 	if ! imagex mount dir.wim dir tmp; then
-		error "Failde to mount test WIM read-only"
+		error "Failed to mount test WIM read-only" \
+		      "Please read any error messages above before reporting this test failure."\
+		      "Perhaps you don't have FUSE installed, or the FUSE kernel module isn't" \
+		      "loaded, or you aren't a member of the FUSE group?"
 	fi
 	echo "Testing extracting file from mounted read-only WIM"
 	if ! cp tmp/lz.c lz.c; then
@@ -266,7 +274,7 @@ do_test() {
 	rm -rf tmp.orig/* tmp.apply/*
 }
 
-. common_tests.sh
+. $srcdir/tests/common_tests.sh
 
 cleanup