Various portability fixes

[wimlib] / tests / test-imagex-mount

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 2317aa607b0211a5ddc8216420e7c4c980927053..4f6d1c95e58521ae0570339abdf65e2c5b207646 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -1,11 +1,17 @@
-#!/bin/sh
+#!/usr/bin/env 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,12 +33,8 @@ 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 test.tar wimlib-staging*
 }
@@ -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
@@ -231,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 ..
@@ -246,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 ..
@@ -266,7 +274,7 @@ do_test() {
        rm -rf tmp.orig/* tmp.apply/*
 }
 
-. common_tests.sh
+. $srcdir/tests/common_tests.sh
 
 cleanup