[PATCH] xfs/148: sort and filter attribute list output

[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]



When I backport fixed patches from Darrick tighten-verifiers tree, this case 
also fails. As below:
-----------------------------------------------------------
"diff test/xfs/148.out result/xfs/148.out.bad
7,8d6
< Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
< Attribute "a_too_many_beans" has a 3 byte value for TEST_DIR/mount-148/testfile
9a8
> Attribute "a_too_many_beans" has a 3 byte value for TEST_DIR/mount-148/testfile
10a10,11
> Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
> Attribute "selinux" has a 37 byte value for TEST_DIR/mount-148/testfile
49,50c50,51
< Attribute "a_are_bad/for_you" had a 3 byte value for TEST_DIR/mount-148/testfile:
< heh
> attr_get: No data available
> Could not get "a_are_bad/for_you" for TEST_DIR/mount-148/testfile"
-------------------------------------------------------------
We should sort attribute list output and filter selinux. Also "a_are_bad/for_you"
doesn't exist, we should correct it in output.

Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Signed-off-by: Yang Xu <xuyang2018.jy@xxxxxxxxxxxxxx>
---
 tests/xfs/148     | 2 +-
 tests/xfs/148.out | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/xfs/148 b/tests/xfs/148
index 42cfdab0..06862faa 100755
--- a/tests/xfs/148
+++ b/tests/xfs/148
@@ -76,7 +76,7 @@ test_names+=("too_many" "are_bad/for_you")
 
 access_stuff() {
 	ls $testdir
-	$ATTR_PROG -l $testfile
+	$ATTR_PROG -l $testfile | grep "a_" | sort
 
 	for name in "${test_names[@]}"; do
 		ls "$testdir/f_$name"
diff --git a/tests/xfs/148.out b/tests/xfs/148.out
index c301ecb6..ab3fc25b 100644
--- a/tests/xfs/148.out
+++ b/tests/xfs/148.out
@@ -4,10 +4,10 @@ f_another
 f_are_bad_for_you
 f_something
 f_too_many_beans
+Attribute "a_another" has a 3 byte value for TEST_DIR/mount-148/testfile
+Attribute "a_are_bad_for_you" has a 3 byte value for TEST_DIR/mount-148/testfile
 Attribute "a_something" has a 3 byte value for TEST_DIR/mount-148/testfile
 Attribute "a_too_many_beans" has a 3 byte value for TEST_DIR/mount-148/testfile
-Attribute "a_are_bad_for_you" has a 3 byte value for TEST_DIR/mount-148/testfile
-Attribute "a_another" has a 3 byte value for TEST_DIR/mount-148/testfile
 TEST_DIR/mount-148/testdir/f_something
 Attribute "a_something" had a 3 byte value for TEST_DIR/mount-148/testfile:
 heh
@@ -46,5 +46,5 @@ ls: cannot access 'TEST_DIR/mount-148/testdir/f_too_many': No such file or direc
 attr_get: No data available
 Could not get "a_too_many" for TEST_DIR/mount-148/testfile
 ls: cannot access 'TEST_DIR/mount-148/testdir/f_are_bad/for_you': No such file or directory
-Attribute "a_are_bad/for_you" had a 3 byte value for TEST_DIR/mount-148/testfile:
-heh
+attr_get: No data available
+Could not get "a_are_bad/for_you" for TEST_DIR/mount-148/testfile
-- 
2.18.0






[Index of Archives]     [Linux Filesystems Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux