From: Alex Elder <aelder@sgi.com>
Date: Fri, 30 Jul 2010 21:54:23 +0000 (+0000)
Subject: xfstests: have getfacl(1) report numeric id's
X-Git-Tag: v1.1.0~152
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0629d835881075c4dfa999b8f9ed9531bd53f1d6;p=xfstests-dev.git

xfstests: have getfacl(1) report numeric id's

This patch arranges for calls to getfacl(1) to be given the "-n"
flag, which requests that user and group id's be listed numerically
rather than using names.  The affected test output files are also
updated to indicate the effect of the change.

This eliminates some spurious output differences I was seeing, due
to the presence of NIS in my test environment.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/051 b/051
index 12febd3c..0606a068 100755
--- a/051
+++ b/051
@@ -343,23 +343,23 @@ acl5=`_create_n_aces 17` # 1 over A.G. libacl initial size
 
 echo "1 below xfs acl max"
 chacl $acl1 largeaclfile
-getfacl largeaclfile | _filter_aces
+getfacl -n largeaclfile | _filter_aces
 
 echo "xfs acl max"
 chacl $acl2 largeaclfile
-getfacl largeaclfile | _filter_aces
+getfacl -n largeaclfile | _filter_aces
 
 echo "1 above xfs acl max"
 chacl $acl3 largeaclfile
-getfacl largeaclfile | _filter_aces
+getfacl -n largeaclfile | _filter_aces
 
 echo "use 16 aces"
 chacl $acl4 largeaclfile
-getfacl largeaclfile | _filter_aces
+getfacl -n largeaclfile | _filter_aces
 
 echo "use 17 aces"
 chacl $acl5 largeaclfile
-getfacl largeaclfile | _filter_aces
+getfacl -n largeaclfile | _filter_aces
 
 #-------------------------------------------------------
 
diff --git a/051.out b/051.out
index 8f9fd371..a8710820 100644
--- a/051.out
+++ b/051.out
@@ -222,8 +222,8 @@ chacl: a::rwx - Invalid argument
 === Test out large ACLs  ===
 1 below xfs acl max
 # file: largeaclfile
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx
@@ -251,8 +251,8 @@ other::rwx
 
 xfs acl max
 # file: largeaclfile
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx
@@ -282,8 +282,8 @@ other::rwx
 1 above xfs acl max
 chacl: cannot set access acl on "largeaclfile": Invalid argument
 # file: largeaclfile
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx
@@ -312,8 +312,8 @@ other::rwx
 
 use 16 aces
 # file: largeaclfile
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx
@@ -333,8 +333,8 @@ other::rwx
 
 use 17 aces
 # file: largeaclfile
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx
diff --git a/067 b/067
index f1c211f8..2669f15a 100755
--- a/067
+++ b/067
@@ -72,19 +72,19 @@ acl21=`_create_n_aces 21`
 
 echo "try 20 aces for access acl"
 chacl $acl20 largeacldir
-getfacl largeacldir | _filter_aces
+getfacl -n largeacldir | _filter_aces
 
 echo "try 20 aces for default acl"
 chacl -d $acl20 largeacldir
-getfacl largeacldir | _filter_aces
+getfacl -n largeacldir | _filter_aces
 
 echo "try 21 aces for access acl"
 chacl $acl21 largeacldir
-getfacl largeacldir | _filter_aces
+getfacl -n largeacldir | _filter_aces
 
 echo "try 21 aces for default acl"
 chacl -d $acl21 largeacldir
-getfacl largeacldir | _filter_aces
+getfacl -n largeacldir | _filter_aces
 
 # success, all done
 status=0
diff --git a/067.out b/067.out
index d746be89..dca6e796 100644
--- a/067.out
+++ b/067.out
@@ -3,8 +3,8 @@ QA output created by 067
 === Test out large ACLs  ===
 try 20 aces for access acl
 # file: largeacldir
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx
@@ -28,8 +28,8 @@ other::rwx
 
 try 20 aces for default acl
 # file: largeacldir
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx
@@ -73,8 +73,8 @@ default:other::rwx
 
 try 21 aces for access acl
 # file: largeacldir
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx
@@ -119,8 +119,8 @@ default:other::rwx
 
 try 21 aces for default acl
 # file: largeacldir
-# owner: root
-# group: root
+# owner: 0
+# group: 0
 user::rwx
 user:1:rwx
 user:2:rwx