From d25439755c2898ac8f5ecfbb025bce7baa4c963d Mon Sep 17 00:00:00 2001 From: josch Date: Fri, 14 Nov 2014 13:07:01 +0100 Subject: [PATCH] make sure that test fuse mount is unmounted even on error --- tests/valgrind_fuse.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/valgrind_fuse.sh b/tests/valgrind_fuse.sh index 4082929..0f22d81 100755 --- a/tests/valgrind_fuse.sh +++ b/tests/valgrind_fuse.sh @@ -49,10 +49,21 @@ fi tree /mnt -printf "foobar" | diff - /mnt/Untitled.txt +diff=`printf "foobar" | diff - /mnt/Untitled.txt >/dev/null 2>&1 && echo 0 || echo 1` + +if [ $diff -ne 0 ]; then + printf "foobar" | diff - /mnt/Untitled.txt || true +fi sleep 2 fusermount -u /mnt wait "$fusepid" +valg=$? + +if [ $diff -eq 0 -a $valg -eq 0 ]; then + exit 0 +else + exit 1 +fi