From f7a9a626a3332d1f4b6c7035a55e41884cdf90dd Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 28 Oct 2012 20:32:54 -0500
Subject: [PATCH] Fix tests (again)

---
 tests/test-imagex                   | 2 +-
 tests/test-imagex-capture_and_apply | 2 +-
 tests/test-imagex-mount             | 2 +-
 tests/test-imagex-ntfs              | 2 +-
 tests/tree-cmp.c                    | 3 ---
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/test-imagex b/tests/test-imagex
index 85689e5d..00bf0044 100755
--- 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 fcac5cee..db3fcbe6 100755
--- 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 21702c07..ebf382ce 100755
--- 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 a129a70f..73cda082 100755
--- 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 0b56d20e..a7327a64 100644
--- 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 */
-- 
2.43.0