X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-ntfs;h=c046c2de7fa39dbe326bb72b8578ed2d98ea0920;hp=412ac20a10e3383e49d17c69788b7dd7ae6934e0;hb=5cdd60306facd14cc9dcc24471386451294ca73c;hpb=4ba34093040be55a44a7707826a4912e594e5291

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 412ac20a..c046c2de 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script does some sanity testing of the 'imagex' program, specifically
 # checking the NTFS capture and apply features.
@@ -9,16 +9,16 @@
 # remain mounted.
 
 set -e
-srcdir=${srcdir:-.}
-srcdir=`realpath $srcdir`
 cd tests
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
 
 imagex() {
 	../imagex $@ > /dev/null
 }
 
 __do_unmount() {
-	if !  fusermount -u $1; then
+	if !  fusermount -z -u $1; then
 		error "Failed to unmount \"$1\""
 	fi
 
@@ -37,7 +37,9 @@ __do_mount() {
 		options="$options,no_def_opts,silent"
 	fi
 	if ! ntfs-3g -o $options $1 $2; then
-		error "Could not mount NTFS volume \"$1\" on \"$2\".  Make sure ntfs-3g is installed."
+		error "Could not mount NTFS volume \"$1\" on \"$2\"!  Make sure ntfs-3g is "\
+		      "installed, and that you are either running the tests as root or have ntfs-3g "\
+		      "installed setuid root, so that we can mount a NTFS volume."
 	fi
 }
 
@@ -48,7 +50,7 @@ do_mount() {
 
 do_mkntfs() {
 	if ! mkntfs --force --fast $1 &> /dev/null; then
-		error "Could not create NTFS volume on \"$1\".  Make sure ntfs-3g / ntfsprogs are installed"
+		error "Could not create NTFS volume \"$1\"!  Make sure ntfsprogs are installed."
 	fi
 }
 
@@ -73,7 +75,10 @@ cleanup() {
 error() {
 	echo "****************************************************************"
 	echo "                         Test failure                           "
-	echo $*
+	while [ $# -gt 0 ]; do
+		echo $1
+		shift
+	done
 	echo "****************************************************************"
 	exit 1
 }
@@ -194,7 +199,7 @@ do_test 'echo 1 > file;
 	 setfattr -n user.aa -v 1111 file;
 	 setfattr -n user.aaa -v 1111 file;
 	 setfattr -n user.aaaa -v 1111 file;'
-	
+
 msg "file with named data streams with same contents as other file"
 do_test 'echo -n > file;
 	 setfattr -n user.a -v 1111 file;
@@ -231,7 +236,7 @@ do_test 'touch file;
 	 touch file2;
 	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file
 	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_2.base64` file'
-	
+
 msg "files with different security descriptors and some with the same security descriptor"
 do_test 'touch file;
 	 touch file2;