From: Eric Biggers <ebiggers3@gmail.com>
Date: Mon, 12 Nov 2012 17:20:00 +0000 (-0600)
Subject: test-imagex-*:  Set $srcdir correctly
X-Git-Tag: v1.1.0~27
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=a3c53f0d3e2ea2267ca89caf100cd41adfabd556;hp=929aa432b681dffea92e62fd60c1753a76fabfd1

test-imagex-*:  Set $srcdir correctly
---

diff --git a/tests/test-imagex b/tests/test-imagex
index 0d49e22e..fcbf5406 100755
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -4,8 +4,9 @@
 # tests every aspect of wimlib comprehensively.
 
 set -e
-srcdir=`pwd`
 cd tests
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
 
 imagex() {
 	echo "imagex $@"
diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index db3fcbe6..00090281 100755
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -9,8 +9,9 @@
 # Also, test if the capture configuration file works correctly.
 
 set -e
-srcdir=`pwd`
 cd tests
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
 
 imagex() {
 	echo "imagex $@"
diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index dcfb27d7..74cff3f7 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -3,8 +3,9 @@
 # Test WIM mounting
 
 set -e
-srcdir=`pwd`
 cd tests
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
 
 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 5e9a2a3f..85812baf 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -9,8 +9,9 @@
 # remain mounted.
 
 set -e
-srcdir=`pwd`
 cd tests
+srcdir="${srcdir:-.}/.."
+srcdir="$(cd $srcdir; pwd)"
 
 imagex() {
 	../imagex $@ > /dev/null