Fix tests (again)

diff --git a/tests/test-imagex b/tests/test-imagex
index 94b697fdce5d40c68d94cd6ceb7103858193a398..25ed8e037915973b0e11b1bf1b0d3a06dd870af0 100755 (executable)
--- 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 d281f8ec10df337872e53ff492eb8fb5bb09963d..1dfc9431568662f92613753be8ba9e58b1bd30a4 100755 (executable)
--- 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 276dcbb5ad19824fd5e628d2e186339a57ba6ecf..22ad6609253b1f933c2ff6a9b712964c8a75ae2e 100755 (executable)
--- 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 45404d17a15a0dfdd50f1adabe91e00811465009..66c39de4846bb8d90060eec53b112bbb38427e8b 100755 (executable)
--- 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 72cda6787e6e370540798b6ec1322eb634301604..4f33f6c1d2844ce131266fb7cb4d3f24fa6ce20a 100644 (file)
--- 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