X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=4f6d1c95e58521ae0570339abdf65e2c5b207646;hb=dc63267ac1da2b75837689e400eed0400e764f4d;hp=21702c0797214d45c84872a74697ea813d978191;hpb=302d18acd7ed0423cfd37a9f1a8f5b70a8fe9965;p=wimlib

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 21702c07..4f6d1c95 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -1,10 +1,17 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Test WIM mounting
 
 set -e
 cd tests
-srcdir=..
+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 $@"
@@ -49,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
 }
 
@@ -69,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
@@ -226,7 +239,7 @@ do_test() {
 	fi
 
 	cd tmp.mnt
-	if ! tar xf ../test.tar; then
+	if ! tar xf ../test.tar --no-same-owner; then
 		error "Failed to untar archive on read-write mounted WIM"
 	fi
 	cd ..
@@ -241,7 +254,7 @@ do_test() {
 	fi
 
 	cd tmp.mnt
-	if ! tar xf ../test.tar; then
+	if ! tar xf ../test.tar --no-same-owner; then
 		error "Failed to untar archive on read-write mounted WIM"
 	fi
 	cd ..