X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=ee8501f195b0a8be15ffd41e6353d1f213c0d479;hp=cd3317afc1ba554527563a1a7a7125439fe7c182;hb=5a172ad88105a66fe903aeacc0f576d7ff2211cd;hpb=54193a504d8dcf1e2dfae727c76cd1b44884518b

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index cd3317af..ee8501f1 100755
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -27,14 +27,10 @@ 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
+			tmp.apply mount.log test.tar wimlib-staging*
 }
 init() {
 	mkdir dir
@@ -266,7 +262,7 @@ do_test() {
 	rm -rf tmp.orig/* tmp.apply/*
 }
 
-. common_tests.sh
+. $srcdir/tests/common_tests.sh
 
 cleanup