Test suite: Allow out of directory build

diff --git a/tests/test-imagex b/tests/test-imagex
index 2c729cb4b468d4077e153d6f4bfc7542af3a30da..a0b88a9658e948c7f452d972622aae07ed15621a 100755 (executable)
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -3,8 +3,8 @@
 # This script does some sanity testing of the 'imagex' program.  It by no means
 # tests every aspect of wimlib comprehensively.
 
-# Assume an in-tree build.
 set -e
+srcdir=`realpath $srcdir`
 cd tests
 
 imagex() {
@@ -24,7 +24,7 @@ rm -rf tmp || true
 
 # Make test directory
 mkdir dir
-cp ../src/*.c ../src/*.h dir
+cp $srcdir/src/*.c $srcdir/src/*.h dir
 mkdir dir/subdir
 echo 'hello' > dir/subdir/hello
 echo 'hello' > dir/subdir/hello2

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 6d7fbd5b2d2db6bd5004389b9e052a1a32ac1550..3b4d5a1454695123ffee4b72ff61b0011c99a47e 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -4,9 +4,12 @@
 # checking the NTFS capture and apply features.
 #
 # This test will fail if wimlib was compiled with --without-ntfs-3g.
+#
+# Please note that cleanup is not done if a test fails, and NTFS volumes may
+# remain mounted.
 
-# Assume an in-tree build.
 set -e
+srcdir=`realpath $srcdir`
 cd tests
 
 imagex() {
@@ -56,7 +59,7 @@ init() {
 cleanup() {
        do_unmount in.mnt
        do_unmount out.mnt
-       rm -rf in.ntfs out.ntfs in.mnt out.mnt in.xattr out.xattr
+       rm -rf in.ntfs out.ntfs in.mnt out.mnt in.xattr out.xattr ntfs.wim
 }
 #trap cleanup exit
 
@@ -209,27 +212,27 @@ do_test 'echo 999 > file;
         setfattr -v DOSNAME -n system.ntfs_dos_name file;'
 
 msg "NTFS volume containing C source code of wimlib"
-do_test 'cp ../../src/*.c ../../src/*.h .'
+do_test 'cp $srcdir/src/*.{c,h} .'
 
 msg "NTFS volume containing file with security descriptor"
 do_test 'touch file;
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` file'
+        setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file'
 
 msg "NTFS volume containing files with different security descriptors"
 do_test 'touch file;
         touch file2;
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` file
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_2.base64` file'
+        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 "NTFS volume containing files with different security descriptors and some with the same security descriptor"
 do_test 'touch file;
         touch file2;
         touch file3;
         mkdir dir;
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` file
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_2.base64` file
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` dir
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` file3'
+        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
+        setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` dir
+        setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file3'
 
 msg "NTFS volume containing tons of random stuff"
 do_test 'echo -n 8 > file;
@@ -239,7 +242,7 @@ do_test 'echo -n 8 > file;
         dd if=/dev/urandom of=randomfile bs=4096 count=10 &>/dev/null;
         mkdir dir;
         setfattr -n system.ntfs_dos_name -v DOSNAME dir;
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` dir
+        setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` dir
         mkdir anotherdir;
         cp file anotherdir;
         ln file anotherdir/anotherhardlink;
@@ -251,18 +254,20 @@ do_test 'echo -n 8 > file;
         setfattr -n user.ads3 anotherfile -v 33;
         echo -n > emptyfile;
         setfattr -n user.ads emptyfile -v 8;
-        setfattr -n user.ads5 emptyfile -v"`cat ../../src/hardlink.c`"
+        setfattr -n user.ads5 emptyfile -v"`cat $srcdir/src/hardlink.c`"
         mkdir dir/subdir;
         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;
-        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` dir/subdir/link;
+        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 "**********************************************************"