X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-ntfs;h=8abab0d368bb4557f1b1f084ae03f0a4f9f10d9f;hp=ff67985af49911524a5ff7736980476b19ee3215;hb=d85424218ef1148204aac3289bbf4ba2c0da9255;hpb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index ff67985a..8abab0d3 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() {
@@ -75,10 +85,10 @@ do_test() {
 	eval "$1"
 	cd ..
 	__do_unmount in.mnt
-	if ! imagex capture in.ntfs ntfs.wim; then
+	if ! wimcapture in.ntfs ntfs.wim; then
 		error "Failed to capture NTFS volume into a WIM"
 	fi
-	if ! imagex apply ntfs.wim 1 out.ntfs; then
+	if ! wimapply ntfs.wim 1 out.ntfs; then
 		error "Failed to apply WIM to NTFS volume"
 	fi
 	__do_mount in.ntfs in.mnt noatime
@@ -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/*
@@ -144,20 +154,6 @@ do_test "dd if=/dev/zero of=file bs=4096 count=10 &> /dev/null"
 msg "file with DOS name"
 do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file"
 
-# To be replaced/removed: files with DOS names can no longer be hard linked as
-# of NTFS-3g 2013.1.13.
-
-#msg "file with DOS name with alphabetically smaller hardlink in same directory"
-#do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file; ln file aaa_link"
-
-#msg "file with DOS name with alphabetically larger hardlink in same directory"
-#do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file; ln file zzz_link"
-
-#msg "file with long name and with DOS name with alphabetically smaller hardlink in same directory"
-#do_test 'echo 1 > file_with_a_long_name;
-	 #setfattr -v "file~1" -n system.ntfs_dos_name file_with_a_long_name;
-	 #ln file_with_a_long_name aaa_link'
-
 msg "many nested directories"
 do_test 'mkdir dir; mkdir dir/subdir; mkdir dir/subdir/subdir2; mkdir dir/subdir/subdir3'
 
@@ -199,26 +195,17 @@ do_test 'echo -n > file;
 
 msg "file with empty named data stream and non-empty unnamed data stream"
 do_test 'echo 1 > file;
-	 setfattr -n user.ads -v "" file;'
+	 setfattr -n user.ads -v 0x file;'
 
 msg "file with empty named data stream and empty unnamed data stream"
 do_test 'echo -n > file;
-	 setfattr -n user.ads -v "" file;'
+	 setfattr -n user.ads -v 0x file;'
 
 msg "file with named data stream with hardlink"
 do_test 'echo 999 > file;
-	 setfattr -n user.ads -v "888" file;
+	 setfattr -n user.ads -v 0x123456 file;
 	 ln file link;'
 
-# To be replaced/removed: files with DOS names can no longer be hard linked as
-# of NTFS-3g 2013.1.13.
-
-#msg "file with named data stream with hardlink and DOS name"
-#do_test 'echo 999 > file;
-	 #setfattr -n user.ads -v "888" file;
-	 #ln file link;
-	 #setfattr -v DOSNAME -n system.ntfs_dos_name file;'
-
 msg "C source code of wimlib"
 do_test 'cp $srcdir/src/*.c .'
 
@@ -262,7 +249,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;