The _casefold_lsattr_dir function lists all of the file attributes.
As result, tests/generic/556.out has an ext4-specific assumption that
files will have the Extents attribute. That won't be true for all
file systems, and it won't even be true for ext4 file systems that do
not have the extents feature enabled.
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
---
common/casefold | 6 +++++-
tests/generic/556.out | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/common/casefold b/common/casefold
index 051fd1d1..2a7ab3eb 100644
--- a/common/casefold
+++ b/common/casefold
@@ -86,5 +86,9 @@ _casefold_unset_attr()
_casefold_lsattr_dir()
{
- $LSATTR_PROG -ld "${1}" | _filter_spaces
+ if $LSATTR_PROG -ld "${1}" | grep -q Casefold ; then
+ echo "${1} Casefold"
+ else
+ echo "${1}"
+ fi
}
diff --git a/tests/generic/556.out b/tests/generic/556.out
index 1573c8b1..47656065 100644
--- a/tests/generic/556.out
+++ b/tests/generic/556.out
@@ -1,9 +1,9 @@
QA output created by 556
-SCRATCH_MNT/basic Extents, Casefold
-SCRATCH_MNT/basic Extents
-SCRATCH_MNT/casefold_flag_removal Extents, Casefold
-SCRATCH_MNT/casefold_flag_removal Extents, Casefold
-SCRATCH_MNT/flag_inheritance/d1/d2/d3 Extents, Casefold
+SCRATCH_MNT/basic Casefold
+SCRATCH_MNT/basic
+SCRATCH_MNT/casefold_flag_removal Casefold
+SCRATCH_MNT/casefold_flag_removal Casefold
+SCRATCH_MNT/flag_inheritance/d1/d2/d3 Casefold
SCRATCH_MNT/symlink/ind1/TARGET
mv: cannot stat 'SCRATCH_MNT/rename/rename': No such file or directory
# file: SCRATCH_MNT/xattrs/x
--
2.23.0
