X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=ebf382ce24e87b835b9b3bf12e9e596682470ee7;hp=2317aa607b0211a5ddc8216420e7c4c980927053;hb=f7a9a626a3332d1f4b6c7035a55e41884cdf90dd;hpb=8b3de832a524f51d228b1b23114e101f544cf65e

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 2317aa60..ebf382ce 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -3,8 +3,7 @@
 # Test WIM mounting
 
 set -e
-srcdir=${srcdir:-.}
-srcdir=`realpath $srcdir`
+srcdir=`pwd`
 cd tests
 
 imagex() {
@@ -27,12 +26,8 @@ imagex_mountrw() {
 }
 
 cleanup() {
-	if mountpoint tmp &> /dev/null; then
-		fusermount -u tmp > /dev/null;
-	fi
-	if mountpoint tmp.mnt &> /dev/null; then
-		fusermount -u tmp.mnt > /dev/null;
-	fi
+	fusermount -u tmp &> /dev/null || true
+	fusermount -u tmp.mnt &> /dev/null || true
 	rm -rf dir* tmp* *.wim *.swm empty.wim tmp.orig tmp.mnt \
 			tmp.apply mount.log test.tar wimlib-staging*
 }
@@ -266,7 +261,7 @@ do_test() {
 	rm -rf tmp.orig/* tmp.apply/*
 }
 
-. common_tests.sh
+. $srcdir/tests/common_tests.sh
 
 cleanup