From a12a56fb24c26e4abe0e95106e3282e8162f6e25 Mon Sep 17 00:00:00 2001
From: Dave Chinner <dchinner@redhat.com>
Date: Mon, 28 Apr 2014 10:55:04 +1000
Subject: [PATCH] shared/051: remove ACL count subtest

Different versions of XFS support different numbers of ACLs on disk.
Remove that subtest from this shared test to prevent it form causing
spurious failures on filesystems that support more than 25 ACLs.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---
 tests/shared/051     |  45 ---------------
 tests/shared/051.out | 135 -------------------------------------------
 2 files changed, 180 deletions(-)

diff --git a/tests/shared/051 b/tests/shared/051
index 39fdad41..2b61f45b 100755
--- a/tests/shared/051
+++ b/tests/shared/051
@@ -318,51 +318,6 @@ chacl m:user1:rwx file1
 chacl a::rwx file1
 set +x
 
-# we return E2BIG if hit the max acl limits on new kernel, but EINVAL
-# on old kernel. So we need to filter out the error message in order
-# to make the updated golden output works for both old and new kernels.
-_filter_largeacl()
-{
-	sed -e "s/Invalid argument/Argument list too long/"
-}
-
-#-------------------------------------------------------
-
-echo ""
-echo "=== Test out large ACLs  ==="
-touch largeaclfile
-XFS_ACL_MAX_ENTRIES=25
-num_aces_pre=`expr $XFS_ACL_MAX_ENTRIES - 1`
-num_aces_post=`expr $XFS_ACL_MAX_ENTRIES + 1`
-
-acl1=`_create_n_aces $num_aces_pre`
-acl2=`_create_n_aces $XFS_ACL_MAX_ENTRIES`
-acl3=`_create_n_aces $num_aces_post`
-acl4=`_create_n_aces 16` # Andreas G. libacl size for initial get
-acl5=`_create_n_aces 17` # 1 over A.G. libacl initial size
-
-echo "1 below xfs acl max"
-chacl $acl1 largeaclfile
-getfacl --numeric largeaclfile | _filter_aces
-
-echo "xfs acl max"
-chacl $acl2 largeaclfile
-getfacl --numeric largeaclfile | _filter_aces
-
-echo "1 above xfs acl max"
-chacl $acl3 largeaclfile 2>&1 | _filter_largeacl
-getfacl --numeric largeaclfile | _filter_aces
-
-echo "use 16 aces"
-chacl $acl4 largeaclfile
-getfacl --numeric largeaclfile | _filter_aces
-
-echo "use 17 aces"
-chacl $acl5 largeaclfile
-getfacl --numeric largeaclfile | _filter_aces
-
-#-------------------------------------------------------
-
 # success, all done
 status=0
 exit
diff --git a/tests/shared/051.out b/tests/shared/051.out
index 354ec6ad..2b5220f7 100644
--- a/tests/shared/051.out
+++ b/tests/shared/051.out
@@ -218,138 +218,3 @@ chacl: m:user1:rwx - Invalid argument
 + chacl a::rwx file1
 chacl: a::rwx - Invalid argument
 + set +x
-
-=== Test out large ACLs  ===
-1 below xfs acl max
-# file: largeaclfile
-# owner: 0
-# group: 0
-user::rwx
-user:1:rwx
-user:2:rwx
-user:3:rwx
-user:4:rwx
-user:5:rwx
-user:6:rwx
-user:7:rwx
-user:8:rwx
-user:9:rwx
-user:10:rwx
-user:11:rwx
-user:12:rwx
-user:13:rwx
-user:14:rwx
-user:15:rwx
-user:16:rwx
-user:17:rwx
-user:18:rwx
-user:19:rwx
-user:20:rwx
-group::rwx
-mask::rwx
-other::rwx
-
-xfs acl max
-# file: largeaclfile
-# owner: 0
-# group: 0
-user::rwx
-user:1:rwx
-user:2:rwx
-user:3:rwx
-user:4:rwx
-user:5:rwx
-user:6:rwx
-user:7:rwx
-user:8:rwx
-user:9:rwx
-user:10:rwx
-user:11:rwx
-user:12:rwx
-user:13:rwx
-user:14:rwx
-user:15:rwx
-user:16:rwx
-user:17:rwx
-user:18:rwx
-user:19:rwx
-user:20:rwx
-user:21:rwx
-group::rwx
-mask::rwx
-other::rwx
-
-1 above xfs acl max
-chacl: cannot set access acl on "largeaclfile": Argument list too long
-# file: largeaclfile
-# owner: 0
-# group: 0
-user::rwx
-user:1:rwx
-user:2:rwx
-user:3:rwx
-user:4:rwx
-user:5:rwx
-user:6:rwx
-user:7:rwx
-user:8:rwx
-user:9:rwx
-user:10:rwx
-user:11:rwx
-user:12:rwx
-user:13:rwx
-user:14:rwx
-user:15:rwx
-user:16:rwx
-user:17:rwx
-user:18:rwx
-user:19:rwx
-user:20:rwx
-user:21:rwx
-group::rwx
-mask::rwx
-other::rwx
-
-use 16 aces
-# file: largeaclfile
-# owner: 0
-# group: 0
-user::rwx
-user:1:rwx
-user:2:rwx
-user:3:rwx
-user:4:rwx
-user:5:rwx
-user:6:rwx
-user:7:rwx
-user:8:rwx
-user:9:rwx
-user:10:rwx
-user:11:rwx
-user:12:rwx
-group::rwx
-mask::rwx
-other::rwx
-
-use 17 aces
-# file: largeaclfile
-# owner: 0
-# group: 0
-user::rwx
-user:1:rwx
-user:2:rwx
-user:3:rwx
-user:4:rwx
-user:5:rwx
-user:6:rwx
-user:7:rwx
-user:8:rwx
-user:9:rwx
-user:10:rwx
-user:11:rwx
-user:12:rwx
-user:13:rwx
-group::rwx
-mask::rwx
-other::rwx
-
-- 
2.30.2