diff --git a/tests/libtest.sh b/tests/libtest.sh index 21de2e87..3e4c4bd6 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -332,3 +332,20 @@ skip_without_user_xattrs () { exit 0 fi } + +skip_without_fuse () { + if ! fusermount --version >/dev/null 2>&1; then + echo "1..0 # SKIP no fusermount" + exit 0 + fi + + if ! [ -w /dev/fuse ]; then + echo "1..0 # SKIP no write access to /dev/fuse" + exit 0 + fi + + if ! [ -e /etc/mtab ]; then + echo "1..0 # SKIP no /etc/mtab" + exit 0 + fi +} diff --git a/tests/test-demo-buildsystem.sh b/tests/test-demo-buildsystem.sh index bffa59c4..97915f94 100755 --- a/tests/test-demo-buildsystem.sh +++ b/tests/test-demo-buildsystem.sh @@ -19,13 +19,9 @@ set -euo pipefail -if ! fusermount --version >/dev/null 2>&1; then - echo "1..0 # SKIP no fusermount" - exit 0 -fi - . $(dirname $0)/libtest.sh +skip_without_fuse skip_without_user_xattrs echo "1..1" diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh index ba45959e..d021df09 100755 --- a/tests/test-rofiles-fuse.sh +++ b/tests/test-rofiles-fuse.sh @@ -19,13 +19,9 @@ set -euo pipefail -if ! fusermount --version >/dev/null 2>&1; then - echo "1..0 # SKIP no fusermount" - exit 0 -fi - . $(dirname $0)/libtest.sh +skip_without_fuse skip_without_user_xattrs setup_test_repository "bare-user"