X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftest-imagex-mount;h=ee8501f195b0a8be15ffd41e6353d1f213c0d479;hb=a04b98b2b4f8823d5f6473584c0b4cb7506edc87;hp=2317aa607b0211a5ddc8216420e7c4c980927053;hpb=8b3de832a524f51d228b1b23114e101f544cf65e;p=wimlib diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount index 2317aa60..ee8501f1 100755 --- a/tests/test-imagex-mount +++ b/tests/test-imagex-mount @@ -27,12 +27,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 +262,7 @@ do_test() { rm -rf tmp.orig/* tmp.apply/* } -. common_tests.sh +. $srcdir/tests/common_tests.sh cleanup