From: Scott Mayhew <smayhew@redhat.com>
Date: Fri, 6 Jul 2018 15:37:38 +0000 (-0400)
Subject: nfs/001: ignore the header in nfs4_getfacl output
X-Git-Tag: v2022.05.01~1461
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0f849ea13f95abaa29aa5b3b3fa9da532a28f53b;p=users%2Fhch%2Fxfstests-dev.git

nfs/001: ignore the header in nfs4_getfacl output

nfs4-acl-tools commit 6630629bb661 ("nfs4_getfacl: Add support to
accept more paths") added a header to the nfs4_getfacl output.  Make
sure the test is only counting the number of ACEs.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/tests/nfs/001 b/tests/nfs/001
index d7a79cb07..23d5c98c1 100755
--- a/tests/nfs/001
+++ b/tests/nfs/001
@@ -55,7 +55,7 @@ $NFS4_SETFACL_PROG -S $acltest.list $acltest.file
 
 # Dump ACL, expect correct number of ACE entries
 $NFS4_GETFACL_PROG $acltest.file >>$seqres.full 2>&1
-$NFS4_GETFACL_PROG $acltest.file | wc -l
+$NFS4_GETFACL_PROG $acltest.file | grep -c "^A"
 
 # success, all done
 status=0