From: Simon McVittie Date: Thu, 31 Mar 2016 13:44:27 +0100 Subject: Skip tests that run rofiles-fuse if /dev/fuse or /etc/mtab unavailable Signed-off-by: Simon McVittie Applied-upstream: 2016.5, commit:https://github.com/ostreedev/ostree/commit/e1ce859368b41c863fe096df84f1ff33e90d725f --- tests/libtest.sh | 17 +++++++++++++++++ tests/test-demo-buildsystem.sh | 6 +----- tests/test-rofiles-fuse.sh | 6 +----- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tests/libtest.sh b/tests/libtest.sh index 21de2e8..3e4c4bd 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 bffa59c..97915f9 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 ba45959..d021df0 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"