From 9860712610612abbe17a8c9e575a66b383fee6ff Mon Sep 17 00:00:00 2001 From: Frank van der Linden Date: Thu, 10 Sep 2020 19:43:55 +0000 Subject: [PATCH] fstests: explicitly specify xattr namespace Explicitly specify the xattr namespace required for tests. This allows tests to be skipped correctly for filesystems that don't support all xattr namespaces. This changes all tests that require anything other than the "user" xattr namespace. When called without arguments as before, _require_attrs() still defaults to the "user" namespace, so those tests do not need to be changed. Signed-off-by: Frank van der Linden Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/generic/062 | 4 ++++ tests/generic/093 | 2 +- tests/generic/097 | 2 +- tests/generic/403 | 2 +- tests/generic/449 | 2 +- tests/overlay/011 | 2 +- tests/overlay/026 | 2 +- tests/overlay/038 | 2 +- tests/overlay/041 | 2 +- tests/overlay/045 | 2 +- tests/overlay/046 | 2 +- tests/overlay/056 | 2 +- tests/xfs/063 | 2 +- tests/xfs/267 | 2 +- tests/xfs/268 | 2 +- 15 files changed, 18 insertions(+), 14 deletions(-) diff --git a/tests/generic/062 b/tests/generic/062 index cab4b4fa..78c1c95c 100755 --- a/tests/generic/062 +++ b/tests/generic/062 @@ -82,6 +82,10 @@ else ATTR_MODES="user trusted" ATTR_FILTER="^(user|trusted)" fi + +_require_attrs $ATTR_MODES + + for nsp in $ATTR_MODES; do for inode in reg dir lnk dev/b dev/c dev/p; do diff --git a/tests/generic/093 b/tests/generic/093 index 10fdcfc7..7ffcfb7d 100755 --- a/tests/generic/093 +++ b/tests/generic/093 @@ -35,7 +35,7 @@ _supported_fs generic _supported_os Linux _require_test -_require_attrs +_require_attrs security _require_user _require_test_program "writemod" _require_command "$SETCAP_PROG" "setcap" diff --git a/tests/generic/097 b/tests/generic/097 index 39730bb0..c2c82460 100755 --- a/tests/generic/097 +++ b/tests/generic/097 @@ -48,7 +48,7 @@ _supported_fs generic _supported_os Linux _require_test -_require_attrs +_require_attrs user trusted echo -e "\ncreate file foo" rm -f $file diff --git a/tests/generic/403 b/tests/generic/403 index 39c64061..9d9ea539 100755 --- a/tests/generic/403 +++ b/tests/generic/403 @@ -36,7 +36,7 @@ rm -f $seqres.full _supported_fs generic _supported_os Linux _require_scratch -_require_attrs +_require_attrs trusted _scratch_mkfs > $seqres.full 2>&1 || _fail "mkfs" _scratch_mount diff --git a/tests/generic/449 b/tests/generic/449 index 21b920bf..129ac9a8 100755 --- a/tests/generic/449 +++ b/tests/generic/449 @@ -39,7 +39,7 @@ _supported_os Linux _require_scratch _require_test _require_acls -_require_attrs +_require_attrs trusted _scratch_mkfs_sized $((256 * 1024 * 1024)) >> $seqres.full 2>&1 _scratch_mount || _fail "mount failed" diff --git a/tests/overlay/011 b/tests/overlay/011 index 1d09341b..b491c37a 100755 --- a/tests/overlay/011 +++ b/tests/overlay/011 @@ -37,7 +37,7 @@ _supported_fs overlay _supported_os Linux _require_test _require_scratch -_require_attrs +_require_attrs trusted # Remove all files from previous tests _scratch_mkfs diff --git a/tests/overlay/026 b/tests/overlay/026 index d0d2a5bf..84fc2412 100755 --- a/tests/overlay/026 +++ b/tests/overlay/026 @@ -53,7 +53,7 @@ rm -f $seqres.full _supported_fs overlay _supported_os Linux _require_scratch -_require_attrs +_require_attrs trusted # Remove all files from previous tests _scratch_mkfs diff --git a/tests/overlay/038 b/tests/overlay/038 index 25f9979b..98267d33 100755 --- a/tests/overlay/038 +++ b/tests/overlay/038 @@ -32,7 +32,7 @@ _supported_os Linux # Use non-default scratch underlying overlay dirs, we need to check # them explicity after test. _require_scratch_nocheck -_require_attrs +_require_attrs trusted _require_test_program "t_dir_type" rm -f $seqres.full diff --git a/tests/overlay/041 b/tests/overlay/041 index 277fb913..d23de4f9 100755 --- a/tests/overlay/041 +++ b/tests/overlay/041 @@ -35,7 +35,7 @@ _supported_os Linux # them explicity after test. _require_scratch_nocheck _require_test -_require_attrs +_require_attrs trusted _require_test_program "t_dir_type" rm -f $seqres.full diff --git a/tests/overlay/045 b/tests/overlay/045 index 34b7ce4c..e5e65734 100755 --- a/tests/overlay/045 +++ b/tests/overlay/045 @@ -33,7 +33,7 @@ rm -f $seqres.full _supported_fs overlay _supported_os Linux _require_scratch_nocheck -_require_attrs +_require_attrs trusted _require_command "$FSCK_OVERLAY_PROG" fsck.overlay OVL_XATTR_OPAQUE_VAL=y diff --git a/tests/overlay/046 b/tests/overlay/046 index 36c74207..fe912ff3 100755 --- a/tests/overlay/046 +++ b/tests/overlay/046 @@ -33,7 +33,7 @@ rm -f $seqres.full _supported_fs overlay _supported_os Linux _require_scratch_nocheck -_require_attrs +_require_attrs trusted _require_command "$FSCK_OVERLAY_PROG" fsck.overlay # remove all files from previous tests diff --git a/tests/overlay/056 b/tests/overlay/056 index dc7b98cb..35169c36 100755 --- a/tests/overlay/056 +++ b/tests/overlay/056 @@ -33,7 +33,7 @@ rm -f $seqres.full _supported_fs overlay _supported_os Linux _require_scratch_nocheck -_require_attrs +_require_attrs trusted _require_command "$FSCK_OVERLAY_PROG" fsck.overlay OVL_XATTR_IMPURE_VAL=y diff --git a/tests/xfs/063 b/tests/xfs/063 index b6d4c03a..85ab1aa8 100755 --- a/tests/xfs/063 +++ b/tests/xfs/063 @@ -32,7 +32,7 @@ _cleanup() _supported_fs xfs _supported_os Linux -_require_attrs +_require_attrs trusted user # create files with EAs _create_dumpdir_fill_ea diff --git a/tests/xfs/267 b/tests/xfs/267 index d13ec19a..f0c60350 100755 --- a/tests/xfs/267 +++ b/tests/xfs/267 @@ -52,7 +52,7 @@ _supported_fs xfs _supported_os Linux _require_tape $TAPE_DEV -_require_attrs +_require_attrs trusted _create_files _erase_hard diff --git a/tests/xfs/268 b/tests/xfs/268 index fa5b9283..07034671 100755 --- a/tests/xfs/268 +++ b/tests/xfs/268 @@ -55,7 +55,7 @@ _supported_fs xfs _supported_os Linux _require_tape $TAPE_DEV -_require_attrs +_require_attrs trusted user _create_files _erase_hard -- 2.30.2