X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-ntfs;h=f22198fb71e4f1c49cc8407f61fb5b1f00132cd5;hb=a02e29cb96edb138c7b220c472e09c2abe3eb858;hp=1f3d1c57c88fb5aefd974fa2aa6ce77c099295df;hpb=3868ce60370c9c62f040c63cd9135791becb2ed9;p=wimlib

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 1f3d1c57..f22198fb 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -12,7 +12,7 @@ set -e
 cd tests
 srcdir="${srcdir:-.}/.."
 srcdir="$(cd $srcdir; pwd)"
-. "$srcdir/tests/tests-common.sh"
+. "$srcdir/tests/test_utils.sh"
 
 TEST_SUBDIR=tmpdir_test-imagex-ntfs
 
@@ -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 .'
 
@@ -236,6 +213,12 @@ msg "file with security descriptor"
 do_test 'touch file;
 	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file'
 
+msg "file with object ID"
+do_test 'touch file;
+	 touch file2;
+	 setfattr -n system.ntfs_object_id -v 0x15ac83a36dc6cf8ec459b8017dd8626f file
+	 setfattr -n system.ntfs_object_id -v 0xf67394c12b17608e1d050d181ba8ffd27df80cbdf620f4c82c79b9e6799147b697621aff72915ade05abb96b15dea1a3e0bda4caa9e33cfd461c92c16be9713d file2'
+
 msg "files with different security descriptors"
 do_test 'touch file;
 	 touch file2;