test-imagex-*: Set $srcdir correctly

[wimlib] / tests / test-imagex-ntfs

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 1012c344707b7abea53ca1c44d4722241bd7a48b..85812baf022dad29c897e5c89fed840f73e02ebe 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -9,16 +9,16 @@
 # remain mounted.
 
 set -e
 # remain mounted.
 
 set -e

-srcdir=${srcdir:-.}
-srcdir=`realpath $srcdir`

 cd tests
 cd tests

+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"

 
 imagex() {
        ../imagex $@ > /dev/null
 }
 
 __do_unmount() {
 
 imagex() {
        ../imagex $@ > /dev/null
 }
 
 __do_unmount() {

-       if !  fusermount -u $1; then
+       if !  fusermount -z -u $1; then

                error "Failed to unmount \"$1\""
        fi
 
                error "Failed to unmount \"$1\""
        fi
 


@@ -199,7 +199,7 @@ do_test 'echo 1 > file;
         setfattr -n user.aa -v 1111 file;
         setfattr -n user.aaa -v 1111 file;
         setfattr -n user.aaaa -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 "file with named data streams with same contents as other file"
 do_test 'echo -n > file;
         setfattr -n user.a -v 1111 file;
 msg "file with named data streams with same contents as other file"
 do_test 'echo -n > file;
         setfattr -n user.a -v 1111 file;


@@ -236,7 +236,7 @@ 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'
         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 "files with different security descriptors and some with the same security descriptor"
 do_test 'touch file;
         touch file2;
 msg "files with different security descriptors and some with the same security descriptor"
 do_test 'touch file;
         touch file2;