From 9c4babf316cfbfad61cfcd0ab8fd5e77e9df13be Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 31 Mar 2016 17:47:36 +0100 Subject: [PATCH] test-xattrs: sync how this is skipped with test-rofiles-fuse If we touch test-xattrs before sourcing libtest.sh, we get: test tmpdir=/tmp/test-tmp-ostree_test-xattrs.sh.test-HSEXEY is not empty; run this test via `make check TESTS=`, not directly Signed-off-by: Simon McVittie Closes: #234 Approved by: cgwalters --- tests/test-xattrs.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/test-xattrs.sh b/tests/test-xattrs.sh index 2f2d99cc..cdc06e87 100755 --- a/tests/test-xattrs.sh +++ b/tests/test-xattrs.sh @@ -19,16 +19,12 @@ set -euo pipefail -touch test-xattrs -if ! setfattr -n user.testvalue -v somevalue test-xattrs; then - echo "1..0 # SKIP: cannot run setfattr" - exit 0 -fi +. $(dirname $0)/libtest.sh + +skip_without_user_xattrs echo "1..2" -. $(dirname $0)/libtest.sh - setup_test_repository "archive-z2" cd ${test_tmpdir}