From ce2e610428c940c2bd5ca1790e7375117b1f6015 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Wed, 15 Feb 2017 23:02:01 +0100 Subject: OSX compat: replace fusermount calls with fuse-unmount.bash Mac OS X does not have fusermount and uses umount instead. The fuse-unmount.bash calls the appropriate command. --- tests/stress_tests/pingpong.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/stress_tests/pingpong.bash') diff --git a/tests/stress_tests/pingpong.bash b/tests/stress_tests/pingpong.bash index ebcb8c5..02aabc9 100755 --- a/tests/stress_tests/pingpong.bash +++ b/tests/stress_tests/pingpong.bash @@ -11,6 +11,7 @@ set -eu cd "$(dirname "$0")" MD5="$PWD/linux-3.0.md5sums" MYNAME=$(basename $0) +source ../fuse-unmount.bash # Setup cd /tmp @@ -22,8 +23,8 @@ mkdir $PING.mnt $PONG.mnt # Cleanup trap # Note: gocryptfs may have already umounted itself because bash relays SIGINT -# Just ignore fusermount errors. -trap "set +e ; cd /tmp; fusermount -u -z $PING.mnt ; fusermount -u -z $PONG.mnt ; rm -rf $PING $PONG $PING.mnt $PONG.mnt" EXIT +# Just ignore unmount errors. +trap "set +e ; cd /tmp; fuse-unmount -z $PING.mnt ; fuse-unmount -z $PONG.mnt ; rm -rf $PING $PONG $PING.mnt $PONG.mnt" EXIT gocryptfs -q -init -extpass="echo test" -scryptn=10 $PING gocryptfs -q -init -extpass="echo test" -scryptn=10 $PONG -- cgit v1.2.3