Update for ntfs-3g 2013.1.13

[wimlib] / tests / test-imagex-ntfs

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index a129a70fcf7ea5e8439bf2771434788398fca6e2..afe441fb208d6d85a5dc7f48c443d6dd9a77e927 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script does some sanity testing of the 'imagex' program, specifically
 # checking the NTFS capture and apply features.
@@ -10,18 +10,21 @@
 
 set -e
 cd tests
-srcdir=..
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
+. "$srcdir/tests/tests-common.sh"
 
 imagex() {
        ../imagex $@ > /dev/null
 }
 
 __do_unmount() {
-       if !  fusermount -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
@@ -154,16 +157,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'
@@ -217,11 +223,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} .'
@@ -271,7 +280,8 @@ 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;