diff --git a/tests/libtest.sh b/tests/libtest.sh index bb1756f3..5b455582 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -291,6 +291,15 @@ run_sh () { ${CMD_PREFIX} flatpak run --command=bash ${ARGS-} org.test.Hello -c "$*" } +# fuse support is needed (and the kernel module needs to be loaded) for several +# flatpak-builder tests +skip_without_fuse () { + if [ ! -w /dev/fuse ] || ! command -v fusermount >/dev/null; then + echo "1..0 # SKIP this test requires fuse support" + exit 0 + fi +} + skip_without_python2 () { if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" diff --git a/tests/test-builder-python.sh b/tests/test-builder-python.sh index 66e70273..589e36d0 100755 --- a/tests/test-builder-python.sh +++ b/tests/test-builder-python.sh @@ -21,6 +21,7 @@ set -euo pipefail . $(dirname $0)/libtest.sh +skip_without_fuse skip_without_python2 echo "1..2" diff --git a/tests/test-builder.sh b/tests/test-builder.sh index 12fa77c8..bdeb3b95 100755 --- a/tests/test-builder.sh +++ b/tests/test-builder.sh @@ -21,6 +21,8 @@ set -euo pipefail . $(dirname $0)/libtest.sh +skip_without_fuse + echo "1..4" setup_repo