X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-ntfs;h=306334946bb4e406df4fdf6927ffb713e30ff5c5;hb=65ce2989a99b8574ab6c105c97d2148e3afa0b7a;hp=e1c8195e0d887fdf7c4db69faff0d3afc04fa7be;hpb=aa8001fbfaf9d7b7327031b03d3e1f0fe8fba2c9;p=wimlib

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index e1c8195e..30633494 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,12 +33,18 @@ do_unmount() {
 	fi
 }
 
+skip_test() {
+	cd ..
+	cleanup
+	exit 77
+}
+
 __do_mount() {
 	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 a NTFS volume (perhaps ntfs-3g is not installed setuid root?)"
-			exit 0
+			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 "\
@@ -56,8 +66,8 @@ 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
@@ -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;