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

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index ebdb861b..8abab0d3 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -85,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
@@ -154,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'
 
@@ -209,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 .'