From: Eric Biggers <ebiggers3@gmail.com>
Date: Thu, 22 Nov 2012 21:33:28 +0000 (-0600)
Subject: Fix tests (again)
X-Git-Tag: v1.2.0
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=4b249654b4e9a339f96c426749c281db66088dcd

Fix tests (again)
---

diff --git a/tests/test-imagex b/tests/test-imagex
index 94b697fd..25ed8e03 100755
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -5,7 +5,9 @@
 
 set -e
 cd tests
-. tests-common.sh
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
+. "$srcdir/tests/tests-common.sh"
 
 imagex() {
 	echo "imagex $@"
diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index d281f8ec..1dfc9431 100755
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -10,7 +10,10 @@
 
 set -e
 cd tests
-. tests-common.sh
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
+. "$srcdir/tests/tests-common.sh"
+
 
 imagex() {
 	echo "imagex $@"
diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 276dcbb5..22ad6609 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -4,7 +4,9 @@
 
 set -e
 cd tests
-. tests-common.sh
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
+. "$srcdir/tests/tests-common.sh"
 
 if [ ! -r /dev/fuse ]; then
 	echo "WARNING: /dev/fuse is not readable."
diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 45404d17..66c39de4 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -10,7 +10,9 @@
 
 set -e
 cd tests
-. tests-common.sh
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
+. "$srcdir/tests/tests-common.sh"
 
 imagex() {
 	../imagex $@ > /dev/null
diff --git a/tests/tests-common.sh b/tests/tests-common.sh
index 72cda678..4f33f6c1 100644
--- a/tests/tests-common.sh
+++ b/tests/tests-common.sh
@@ -1,6 +1,3 @@
-srcdir="${srcdir:-.}/.."
-srcdir="$(cd $srcdir; pwd)"
-
 if stat -c %i . &> /dev/null ; then
 	BSD_STAT=0
 else