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

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index c046c2de..9705d9ec 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -12,17 +12,17 @@ set -e
 cd tests
 srcdir="${srcdir:-.}/.."
 srcdir="$(cd $srcdir; pwd)"
+. "$srcdir/tests/tests-common.sh"
 
-imagex() {
-	../imagex $@ > /dev/null
-}
+TEST_SUBDIR=tmpdir_test-imagex-ntfs
 
 __do_unmount() {
-	if !  fusermount -z -u $1; then
+	if ! fusermount -z -u $1; then
 		error "Failed to unmount \"$1\""
 	fi
 
 }
+
 do_unmount() {
 	if mountpoint $1 &> /dev/null; then
 		__do_unmount $1
@@ -49,7 +49,7 @@ do_mount() {
 }
 
 do_mkntfs() {
-	if ! mkntfs --force --fast $1 &> /dev/null; then
+	if ! mkntfs --force --fast $1 > /dev/null; then
 		error "Could not create NTFS volume \"$1\"!  Make sure ntfsprogs are installed."
 	fi
 }
@@ -65,22 +65,9 @@ init() {
 }
 
 cleanup() {
-	do_unmount in.mnt
-	do_unmount out.mnt
-	rm -rf in.ntfs out.ntfs in.mnt out.mnt in.xattr out.xattr ntfs.wim
-}
-#trap cleanup exit
-
-
-error() {
-	echo "****************************************************************"
-	echo "                         Test failure                           "
-	while [ $# -gt 0 ]; do
-		echo $1
-		shift
-	done
-	echo "****************************************************************"
-	exit 1
+	do_unmount $TEST_SUBDIR/in.mnt
+	do_unmount $TEST_SUBDIR/out.mnt
+	rm -rf $TEST_SUBDIR
 }
 
 do_test() {
@@ -99,7 +86,7 @@ do_test() {
 	if [ -x /usr/bin/tree ]; then
 		tree in.mnt --inodes -F -s --noreport
 	fi
-	if ! ./tree-cmp in.mnt out.mnt NTFS; then
+	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
@@ -117,6 +104,8 @@ msg() {
 }
 
 cleanup
+mkdir $TEST_SUBDIR
+cd $TEST_SUBDIR
 init
 
 msg "Empty NTFS volume"
@@ -155,16 +144,19 @@ 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"
 
-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"
+# 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 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 "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'
@@ -218,11 +210,14 @@ do_test 'echo 999 > file;
 	 setfattr -n user.ads -v "888" file;
 	 ln file link;'
 
-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;'
+# 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,h} .'
@@ -272,15 +267,18 @@ do_test 'echo -n 8 > file;
 	 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;
+	 echo -n > dir/subdir/empty;
+	 setfattr -n system.ntfs_dos_name -v 123 dir/subdir/empty;
 	 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 "**********************************************************"
+
+cd ..
+cleanup
+