aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiƩbaud Weksteen <tweek@google.com>2024-02-19 11:09:49 +1100
committerRob Landley <rob@landley.net>2024-02-20 12:50:47 -0600
commit2c96060080ec6f8ea07ede14c8ea2f36293a6379 (patch)
tree72d8bcd9ec9b83408be0c05e18d7d97d65c5957c
parent43c9ee33216cf5a49f227c566367a013a0f165ed (diff)
downloadtoybox-2c96060080ec6f8ea07ede14c8ea2f36293a6379.tar.gz
Fix tests for getfattr/setfattr
The test system may have extended attributes set by default (for instance, security.selinux on Android). Use the -n option to limit the output.
-rw-r--r--tests/getfattr.test10
-rw-r--r--tests/setfattr.test15
2 files changed, 12 insertions, 13 deletions
diff --git a/tests/getfattr.test b/tests/getfattr.test
index ae33d766..0ac0a41f 100644
--- a/tests/getfattr.test
+++ b/tests/getfattr.test
@@ -8,18 +8,14 @@ mkdir attrs
touch attrs/file
setfattr -n user.empty attrs/file
setfattr -n user.data -v hello attrs/file
-setfattr -n user.more -v world attrs/file
-testing "" "getfattr attrs/file" \
- "# file: attrs/file\nuser.data\nuser.empty\nuser.more\n\n" "" ""
-testing "-d" "getfattr -d attrs/file" \
- "# file: attrs/file\nuser.data=\"hello\"\nuser.empty\nuser.more=\"world\"\n\n" "" ""
+# The filesystem may include some extended attributes by default (for
+# instance, security.selinux). Use the -n option to limit the output.
+
testing "-n" "getfattr -n user.empty attrs/file" \
"# file: attrs/file\nuser.empty\n\n" "" ""
testing "-d -n" "getfattr -d -n user.data attrs/file" \
"# file: attrs/file\nuser.data=\"hello\"\n\n" "" ""
-testing "--only-values" "getfattr --only-values attrs/file" \
- "helloworld" "" ""
testing "--only-values -n" "getfattr --only-values -n user.data attrs/file" \
"hello" "" ""
diff --git a/tests/setfattr.test b/tests/setfattr.test
index 6a044ea2..6bbb3ec8 100644
--- a/tests/setfattr.test
+++ b/tests/setfattr.test
@@ -10,12 +10,15 @@ setfattr -n user.empty attrs/file
setfattr -n user.data -v hello attrs/file
setfattr -n user.delete-me -v hello attrs/file
+# The filesystem may include some extended attributes by default (for
+# instance, security.selinux). Use the -n option to limit the output.
+
testing "-x" \
- "setfattr -x user.delete-me attrs/file && getfattr attrs/file" \
- "# file: attrs/file\nuser.data\nuser.empty\n\n" "" ""
-testing "-n" "setfattr -n user.new attrs/file && getfattr -d attrs/file" \
- "# file: attrs/file\nuser.data=\"hello\"\nuser.empty\nuser.new\n\n" "" ""
-testing "-n -v" "setfattr -n user.new -v data attrs/file && getfattr -d attrs/file" \
- "# file: attrs/file\nuser.data=\"hello\"\nuser.empty\nuser.new=\"data\"\n\n" "" ""
+ "setfattr -x user.delete-me attrs/file && getfattr -n user.delete-me attrs/file" \
+ "# file: attrs/file\n\n" "" ""
+testing "-n" "setfattr -n user.new attrs/file && getfattr -n user.new -d attrs/file" \
+ "# file: attrs/file\nuser.new\n\n" "" ""
+testing "-n -v" "setfattr -n user.new -v data attrs/file && getfattr -n user.new -d attrs/file" \
+ "# file: attrs/file\nuser.new=\"data\"\n\n" "" ""
rm -rf attrs