X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-ntfs;h=cf8b6d1b4361c46a53025b2f7a29e030c2c236e8;hp=7645f21160a16a560624c54831f7c5ad3505fb7e;hb=54193a504d8dcf1e2dfae727c76cd1b44884518b;hpb=4afbeedd7a81df800171239741e0d252d445a878

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 7645f211..cf8b6d1b 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -4,32 +4,43 @@
 # checking the NTFS capture and apply features.
 #
 # This test will fail if wimlib was compiled with --without-ntfs-3g.
+#
+# Please note that cleanup is not done if a test fails, and NTFS volumes may
+# remain mounted.
 
-# Assume an in-tree build.
 set -e
+srcdir=${srcdir:-.}
+srcdir=`realpath $srcdir`
 cd tests
 
 imagex() {
-	#echo "imagex $@"
 	../imagex $@ > /dev/null
 }
 
+__do_unmount() {
+	if !  fusermount -u $1; then
+		error "Failed to unmount \"$1\""
+	fi
+
+}
 do_unmount() {
 	if mountpoint $1 &> /dev/null; then
-		if !  fusermount -u $1; then
-			error "Failed to unmount \"$1\""
-		fi
+		__do_unmount $1
 	fi
 }
 
-do_mount() {
-	do_unmount $2
+__do_mount() {
 	options="$3"
 	if ! ntfs-3g ${options:+-o $options} $1 $2; then
 		error "Could not mount NTFS volume \"$1\" on \"$2\".  Make sure ntfs-3g is installed."
 	fi
 }
 
+do_mount() {
+	do_unmount $2
+	__do_mount $1 $2 $3
+}
+
 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"
@@ -38,17 +49,18 @@ do_mkntfs() {
 
 init() {
 	echo "Creating NTFS volumes and empty directories to use as mountpoints"
-	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
+	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
 	mkdir in.mnt out.mnt
 	do_mkntfs in.ntfs
 	do_mkntfs out.ntfs
+	do_mount in.ntfs in.mnt
 }
 
 cleanup() {
 	do_unmount in.mnt
 	do_unmount out.mnt
-	rm -rf in.ntfs out.ntfs in.mnt out.mnt in.xattr out.xattr
+	rm -rf in.ntfs out.ntfs in.mnt out.mnt in.xattr out.xattr ntfs.wim
 }
 #trap cleanup exit
 
@@ -61,95 +73,44 @@ error() {
 	exit 1
 }
 
-do_capture() {
-	do_unmount in.mnt
+do_test() {
+	cd in.mnt
+	eval "$1"
+	cd ..
+	__do_unmount in.mnt
 	if ! imagex capture in.ntfs ntfs.wim; then
 		error "Failed to capture NTFS volume into a WIM"
 	fi
-}
-
-do_apply() {
-	do_unmount out.mnt
-	do_mkntfs out.ntfs
 	if ! imagex apply ntfs.wim 1 out.ntfs; then
 		error "Failed to apply WIM to NTFS volume"
 	fi
-}
-
-cmp_xattrs() {
-	infile=$1
-	outfile=$2
-	xattr=$3
-	#echo "Comparing xattr $xattr of $infile and $outfile"
-	if test "$xattr" = "system.ntfs_times"; then
-		headnum=24
-	else
-		headnum=1000000000
+	__do_mount in.ntfs in.mnt noatime
+	__do_mount out.ntfs out.mnt noatime
+	if [ -x /usr/bin/tree ]; then
+		tree in.mnt --inodes -F -s --noreport
 	fi
-	if eval getfattr --only-values -h -d -n $xattr $infile 2>/dev/null\
-					| head -c $headnum > in.xattr; then
-		if eval getfattr --only-values -h -d -n $xattr $outfile 2>/dev/null\
-					| head -c $headnum > out.xattr; then
-			if ! cmp in.xattr out.xattr; then
-				error "Extended attribute $xattr of $infile and $outfile differs"
-			fi
-		else
-			error "$infile has extended attribute $xattr, but $outfile doesn't"
-		fi
-	else
-		if eval getfattr --only-values -h -d -n $xattr $outfile 2>/dev/null\
-					| head -c $headnum > out.xattr; then
-			error "$outfile has extended attribute $xattr, but $infile doesn't"
+	if ! ./tree-cmp in.mnt out.mnt NTFS; then
+		if [ -x /usr/bin/tree ]; then
+			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'
 		fi
 	fi
-}
-
-# Captures in.ntfs, applies it to out.ntfs, and diffs the result including
-# extended attributes
-do_capture_and_apply() {
-	do_capture
-	do_apply
-	do_mount in.ntfs in.mnt ro
-	do_mount out.ntfs out.mnt ro
-	#if ! diff -r in.mnt out.mnt; then
-		#error "Recursive diff of original NTFS volume with applied NTFS volume failed"
-	#fi
-	for infile in `find in.mnt`; do
-		outfile=out.mnt${infile##in.mnt}
-		#echo "Comparing xattrs of $infile and $outfile"
-		if [ ! -L $infile -a ! -d $infile ]; then
-			if ! cmp $infile $outfile; then
-				error "Contents of $infile and $outfile differed"
-			fi
-		fi
-		cmp_xattrs $infile $outfile system.ntfs_attrib
-		cmp_xattrs $infile $outfile system.ntfs_reparse_data
-		cmp_xattrs $infile $outfile system.ntfs_acl
-		cmp_xattrs $infile $outfile system.ntfs_dos_name
-		cmp_xattrs $infile $outfile system.ntfs_times
-	done
-}
-
-build_ntfs() {
-	do_unmount in.mnt
-	do_mkntfs in.ntfs
-	do_mount in.ntfs in.mnt
-	( cd in.mnt; eval "$1" )
-}
-
-do_test() {
-	build_ntfs "$1"
-	do_capture_and_apply
+	rm -rf out.mnt/* in.mnt/*
+	__do_unmount out.mnt
 }
 msg() {
-	echo "Testing image capture and application of $1"
+	echo "--------------------------------------------------------------------"
+	echo "Testing image capture and application of NTFS volume containing $1"
+	echo "--------------------------------------------------------------------"
 }
 
 cleanup
 init
 
 msg "Empty NTFS volume"
-do_capture_and_apply
+do_test ""
 
 msg "NTFS volume containing a single file"
 do_test "echo 1 > file"
@@ -184,6 +145,132 @@ do_test "dd if=/dev/zero of=file bs=4096 count=10 &> /dev/null"
 msg "NTFS volume containing file with DOS name"
 do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file"
 
-msg "NTFS volume containing file with DOS name with hardlink in same directory"
-do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file; ln file link"
+msg "NTFS volume containing 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 "NTFS volume containing 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 "NTFS volume containing 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 "NTFS volume containing many nested directories"
+do_test 'mkdir dir; mkdir dir/subdir; mkdir dir/subdir/subdir2; mkdir dir/subdir/subdir3'
+
+msg "NTFS volume containing identical files and symlinks in subdirectory"
+do_test 'mkdir dir;
+	 echo 888 > dir/file;
+	 echo 888 > dir/idfile2;
+	 ln -s ../dir dir/circle; ln -s file dir/filelink'
+
+msg "NTFS volume containing hard link group and identical files not hard linked"
+do_test 'echo 888 > file;
+	 echo 888 > file2;
+	 ln file link;
+	 ln file link2;
+	 echo 888 > file3'
+
+msg "NTFS volume containing file with named data stream"
+do_test 'echo 1 > file;
+	 setfattr -n user.ads -v 2 file'
+
+msg "NTFS volume containing file with multiple named data streams"
+do_test 'echo 1 > file;
+	 setfattr -n user.a -v 1 file;
+	 setfattr -n user.aa -v 11 file;
+	 setfattr -n user.aaa -v 111 file;
+	 setfattr -n user.aaaa -v 1111 file'
+
+msg "NTFS volume containing file with multiple named data streams with same contents"
+do_test 'echo 1 > file;
+	 setfattr -n user.a -v 1111 file;
+	 setfattr -n user.aa -v 1111 file;
+	 setfattr -n user.aaa -v 1111 file;
+	 setfattr -n user.aaaa -v 1111 file;'
+	
+msg "NTFS volume containing file with named data streams with same contents as other file"
+do_test 'echo -n > file;
+	 setfattr -n user.a -v 1111 file;
+	 echo -n 1111 > otherfile;'
+
+msg "NTFS volume containing file with empty named data stream and non-empty unnamed data stream"
+do_test 'echo 1 > file;
+	 setfattr -n user.ads -v "" file;'
+
+msg "NTFS volume containing file with empty named data stream and empty unnamed data stream"
+do_test 'echo -n > file;
+	 setfattr -n user.ads -v "" file;'
+
+msg "NTFS volume containing file with named data stream with hardlink"
+do_test 'echo 999 > file;
+	 setfattr -n user.ads -v "888" file;
+	 ln file link;'
+
+msg "NTFS volume containing 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 "NTFS volume containing C source code of wimlib"
+do_test 'cp $srcdir/src/*.{c,h} .'
+
+msg "NTFS volume containing file with security descriptor"
+do_test 'touch file;
+	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file'
+
+msg "NTFS volume containing files with different security descriptors"
+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 "NTFS volume containing files with different security descriptors and some with the same security descriptor"
+do_test 'touch file;
+	 touch file2;
+	 touch file3;
+	 mkdir dir;
+	 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
+	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` dir
+	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file3'
+
+msg "NTFS volume containing tons of random stuff"
+do_test 'echo -n 8 > file;
+	 ln file hardlink;
+	 ln -s hardlink symlink;
+	 echo -n 8 > identical file;
+	 dd if=/dev/urandom of=randomfile bs=4096 count=10 &>/dev/null;
+	 mkdir dir;
+	 setfattr -n system.ntfs_dos_name -v DOSNAME dir;
+	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` dir
+	 mkdir anotherdir;
+	 cp file anotherdir;
+	 ln file anotherdir/anotherhardlink;
+	 ln -s .. anotherdir/anothersymlink;
+	 ln -s anothersymlink anotherdir/symlinktosymlink;
+	 echo -n 33 > anotherfile;
+	 setfattr -n user.ads anotherfile -v 33;
+	 setfattr -n user.ads2 anotherfile -v 8;
+	 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`"
+	 mkdir dir/subdir;
+	 ln file dir/subdir/file;
+	 echo -n 8 > dir/subdir/file2;
+	 ln dir/subdir/file dir/subdir/link;
+	 setfattr -n system.ntfs_dos_name -v 123 dir/subdir/link;
+	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` dir/subdir/link;
+	 setfattr -n user.yet_another_ads -v "" dir/subdir/link;
+	 setfattr -n user.yet_another_ads2 -v "" dir/subdir/link;
+	 setfattr -n user.yet_another_ads3 -v "abc" dir/subdir/link;
+	 setfattr -n user.yet_another_ads4 -v "" dir/subdir/link;'
+
+cleanup
 
+echo "**********************************************************"
+echo "           NTFS capture/apply tests passed                "
+echo "**********************************************************"