Fix tests (again)

diff --git a/tests/test-imagex b/tests/test-imagex
index 85689e5deb44531c90147b3eb2656672f662dad4..00bf0044711888ecd040889b7fd0239e3d40fa5f 100755 (executable)
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -4,8 +4,8 @@
 # tests every aspect of wimlib comprehensively.
 
 set -e
+srcdir=`pwd`
 cd tests
-srcdir=..
 
 imagex() {
        echo "imagex $@"

diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index fcac5cee4a36096ca1b817f178a7a40eb66f76ed..db3fcbe69e501d81fc595672907bc696c50890bb 100755 (executable)
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -9,8 +9,8 @@
 # Also, test if the capture configuration file works correctly.
 
 set -e
+srcdir=`pwd`
 cd tests
-srcdir=..
 
 imagex() {
        echo "imagex $@"

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 21702c0797214d45c84872a74697ea813d978191..ebf382ce24e87b835b9b3bf12e9e596682470ee7 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -3,8 +3,8 @@
 # Test WIM mounting
 
 set -e
+srcdir=`pwd`
 cd tests
-srcdir=..
 
 imagex() {
        echo "imagex $@"

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index a129a70fcf7ea5e8439bf2771434788398fca6e2..73cda082a3296ed5d993524e23dce7044533248d 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -9,8 +9,8 @@
 # remain mounted.
 
 set -e
+srcdir=`pwd`
 cd tests
-srcdir=..
 
 imagex() {
        ../imagex $@ > /dev/null

diff --git a/tests/tree-cmp.c b/tests/tree-cmp.c
index 0b56d20eaf3cdeddf883c3f5b2b069fde8da57b7..a7327a64fee9ccbb9bd94cc1909b4b9e718dd18d 100644 (file)
--- a/tests/tree-cmp.c
+++ b/tests/tree-cmp.c
@@ -222,9 +222,6 @@ static void cmp_xattr(const char *file1, const char *file2,
        }
        free(buf1);
        free(buf2);
-       fprintf(stderr, "tree-cmp: Warning: cannot compare xattrs of `%s' and `%s'\n",
-                       file1, file2);
-       fprintf(stderr, "          You need to install the attr development files for this.\n");
 }
 
 /* Compares all alternate data streams of the files */