X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-ntfs;h=ebdb861b677dcff8150ea61fdd6fe051fe5f194e;hb=76b9892785bcdca5d43324f8896fa5ca3c427b1b;hp=9705d9ecf156e744efbeb3e1a0a521d25f094a50;hpb=e485f32e610f77f15a298f62647d0cfb3cf8d11b;p=wimlib

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 9705d9ec..ebdb861b 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -17,10 +17,14 @@ srcdir="$(cd $srcdir; pwd)"
 TEST_SUBDIR=tmpdir_test-imagex-ntfs
 
 __do_unmount() {
-	if ! fusermount -z -u $1; then
-		error "Failed to unmount \"$1\""
-	fi
-
+	for ((i = 0; i < 10; i++)); do
+		if fusermount -z -u $1; then
+			return 0
+		else
+			sleep 1
+		fi
+	done
+	error "Failed to unmount \"$1\""
 }
 
 do_unmount() {
@@ -29,17 +33,23 @@ do_unmount() {
 	fi
 }
 
+skip_test() {
+	cd ..
+	cleanup
+	exit 77
+}
+
 __do_mount() {
-	options="$3"
-	if [ -z "$options" ]; then
-		options="no_def_opts,silent"
-	else
-		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, 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."
+	if ! ntfs-3g -o "no_def_opts,silent" $1 $2; then
+		if [ $UID -ne 0 ] && [ "$3" = "nofail" ]; then
+			echo "WARNING: skipping NTFS tests because we aren't able to "
+			echo "mount an NTFS volume (perhaps ntfs-3g is not installed setuid root?)"
+			skip_test
+		else
+			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 an NTFS volume."
+		fi
 	fi
 }
 
@@ -56,12 +66,12 @@ do_mkntfs() {
 
 init() {
 	echo "Creating NTFS volumes and empty directories to use as mountpoints"
-	dd if=/dev/zero of=in.ntfs bs=4096 count=500 &> /dev/null
-	dd if=/dev/zero of=out.ntfs bs=4096 count=500 &> /dev/null
+	dd if=/dev/zero of=in.ntfs bs=4096 count=1000 &> /dev/null
+	dd if=/dev/zero of=out.ntfs bs=4096 count=1000 &> /dev/null
 	mkdir in.mnt out.mnt
 	do_mkntfs in.ntfs
 	do_mkntfs out.ntfs
-	do_mount in.ntfs in.mnt
+	do_mount in.ntfs in.mnt nofail
 }
 
 cleanup() {
@@ -91,7 +101,7 @@ do_test() {
 			echo "Dumping tree of applied image"
 			tree out.mnt --inodes -F -s --noreport
 			error 'Information was lost or corrupted while capturing
-				and then applying a NTFS volume'
+				and then applying an NTFS volume'
 		fi
 	fi
 	rm -rf out.mnt/* in.mnt/*
@@ -220,7 +230,7 @@ do_test 'echo 999 > file;
 	 #setfattr -v DOSNAME -n system.ntfs_dos_name file;'
 
 msg "C source code of wimlib"
-do_test 'cp $srcdir/src/*.{c,h} .'
+do_test 'cp $srcdir/src/*.c .'
 
 msg "file with security descriptor"
 do_test 'touch file;
@@ -262,7 +272,7 @@ do_test 'echo -n 8 > file;
 	 setfattr -n user.ads3 anotherfile -v 33;
 	 echo -n > emptyfile;
 	 setfattr -n user.ads emptyfile -v 8;
-	 setfattr -n user.ads5 emptyfile -v"`cat $srcdir/src/hardlink.c`"
+	 setfattr -n user.ads5 emptyfile -v"`cat $srcdir/src/sha1.c`"
 	 mkdir dir/subdir;
 	 ln file dir/subdir/file;
 	 echo -n 8 > dir/subdir/file2;