From: Tim Shimmin <tes@sgi.com>
Date: Tue, 1 May 2001 01:01:05 +0000 (+0000)
Subject: Fix up filtering to make deterministic.
X-Git-Tag: v1.1.0~1263
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9efce32a3dc7991b101c3d522455b823ef31353d;p=users%2Fhch%2Fxfstests-dev.git

Fix up filtering to make deterministic.
Needed when changed chacl to give better error msg.
---

diff --git a/051 b/051
index ab3024d00..04bb97af2 100755
--- a/051
+++ b/051
@@ -186,7 +186,7 @@ echo "=== Test Extended ACLs ==="
 echo ""
 echo "--- Test adding a USER ACE ---"
 echo "Expect to FAIL as no MASK provided"
-chacl u::---,g::---,o::---,u:$acl2:r-x file1 2>&1
+chacl u::---,g::---,o::---,u:$acl2:r-x file1 2>&1 | _acl_filter_id
 echo "Ensure that ACL has not been changed"
 chacl -l file1 | _acl_filter_id
 echo "Expect to PASS - USER ACE matches user"
@@ -199,7 +199,7 @@ $runas -u $acl3 -g $acl3 ./file1 2>&1
 echo ""
 echo "--- Test adding a GROUP ACE ---"
 echo "Expect to FAIL as no MASK provided"
-chacl u::---,g::---,o::---,g:$acl2:r-x file1 2>&1
+chacl u::---,g::---,o::---,g:$acl2:r-x file1 2>&1 | _acl_filter_id
 echo "Ensure that ACL has not been changed"
 chacl -l file1 | _acl_filter_id
 chacl u::---,g::---,o::---,g:$acl2:r-x,m::rwx file1 2>&1
diff --git a/051.out b/051.out
index 3812e3db3..1829e4224 100644
--- a/051.out
+++ b/051.out
@@ -49,7 +49,7 @@ Test was executed
 
 --- Test adding a USER ACE ---
 Expect to FAIL as no MASK provided
-chacl: "u::---,g::---,o::---,u:17:r-x" is an invalid ACL specification.
+chacl: "u::---,g::---,o::---,u:id2:r-x" is an invalid ACL specification.
 Ensure that ACL has not been changed
 file1 [u::---,g::---,o::r-x]
 Expect to PASS - USER ACE matches user
@@ -60,7 +60,7 @@ Expect to FAIL - USER ACE does not match user
 
 --- Test adding a GROUP ACE ---
 Expect to FAIL as no MASK provided
-chacl: "u::---,g::---,o::---,g:17:r-x" is an invalid ACL specification.
+chacl: "u::---,g::---,o::---,g:id2:r-x" is an invalid ACL specification.
 Ensure that ACL has not been changed
 file1 [u::---,g::---,o::---,u:id2:r-x,m::rwx]
 file1 [u::---,g::---,o::---,g:id2:r-x,m::rwx]