1 files changed, 9 insertions, 49 deletions

diff --git a/test/root/getfattr.test b/test/root/getfattr.test
index c9458e6..aaa6d9a 100644
--- a/test/root/getfattr.test
+++ b/test/root/getfattr.test
@@ -25,99 +25,59 @@ With -h, we do not dereference symlinks:
 	>
 
 Do the same for symlinks we find in a directory hierarchy:
-	$ getfattr -m- -Rd .
+	$ getfattr -m- -Rd . | grep file: | sort
 	> # file: f
-	> user.test="test"
-	>
 	> # file: l
-	> user.test="test"
-	>
 
-	$ getfattr -m- -Rhd .
+	$ getfattr -m- -Rhd . | grep file: | sort
 	> # file: f
-	> user.test="test"
-	>
 	> # file: l
-	> trusted.test="test"
-	>
 
 Make sure we follow symlinks on the command line only when we should:
 	$ ln -s . here
-	$ getfattr -m- -Rd here
+	$ getfattr -m- -Rd here | grep file: | sort
 	> # file: here/f
-	> user.test="test"
-	>
 	> # file: here/l
-	> user.test="test"
-	>
 
-	$ getfattr -m- -Rhd here
+	$ getfattr -m- -Rhd here | grep file: | sort
 	> # file: here/f
-	> user.test="test"
-	>
 	> # file: here/l
-	> trusted.test="test"
-	>
 
-	$ getfattr -m- -RLhd here
+	$ getfattr -m- -RLhd here | grep file: | sort
 	> # file: here/f
-	> user.test="test"
-	>
 	> # file: here/l
-	> trusted.test="test"
-	>
 
 	$ getfattr -m- -RPhd here
 
 Make sure we recurse into sub-directories:
 	$ mkdir sub
 	$ mv f l sub
-	$ getfattr -m- -Rd .
+	$ getfattr -m- -Rd . | grep file: | sort
 	> # file: sub/f
-	> user.test="test"
-	>
 	> # file: sub/l
-	> user.test="test"
-	>
 
-	$ getfattr -m- -Rhd .
+	$ getfattr -m- -Rhd . | grep file: | sort
 	> # file: sub/f
-	> user.test="test"
-	>
 	> # file: sub/l
-	> trusted.test="test"
-	>
 
 Make sure we follow symlinks to directories only when we should:
 	$ mkdir sub2
 	$ ln -s ../sub sub2/to-sub
 	$ getfattr -m- -Rhd sub2
 
-	$ getfattr -m- -RLhd sub2
+	$ getfattr -m- -RLhd sub2 | grep file: | sort
 	> # file: sub2/to-sub/f
-	> user.test="test"
-	>
 	> # file: sub2/to-sub/l
-	> trusted.test="test"
-	>
 
 	$ getfattr -m- -RPhd sub2
 
 Symlink loop detection:
 	$ ln -s .. sub/up
-	$ getfattr -m- -RLhd .
+	$ getfattr -m- -RLhd . | grep file: | sort
 	> # file: sub2/to-sub/f
-	> user.test="test"
-	>
 	> # file: sub2/to-sub/l
-	> trusted.test="test"
-	>
 	> # file: sub/f
-	> user.test="test"
-	>
 	> # file: sub/l
-	> trusted.test="test"
-	>
 
 	$ cd ..
 	$ rm -rf d