* [PATCH] xfstests: shared/051: update golden output to match the XFS max acl return errno @ 2014-03-10 8:32 Jeff Liu 2014-03-10 8:35 ` Christoph Hellwig 2014-03-10 20:53 ` Dave Chinner 0 siblings, 2 replies; 5+ messages in thread From: Jeff Liu @ 2014-03-10 8:32 UTC (permalink / raw) To: xfs@oss.sgi.com From: Jie Liu <jeff.liu@oracle.com> Update the golden output to match the recently XFS return errno changes if hit the limits of maximum number of ACLs. Signed-off-by: Jie Liu <jeff.liu@oracle.com> --- tests/shared/051.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shared/051.out b/tests/shared/051.out index a871082..354ec6a 100644 --- a/tests/shared/051.out +++ b/tests/shared/051.out @@ -280,7 +280,7 @@ mask::rwx other::rwx 1 above xfs acl max -chacl: cannot set access acl on "largeaclfile": Invalid argument +chacl: cannot set access acl on "largeaclfile": Argument list too long # file: largeaclfile # owner: 0 # group: 0 -- 1.8.3.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] xfstests: shared/051: update golden output to match the XFS max acl return errno 2014-03-10 8:32 [PATCH] xfstests: shared/051: update golden output to match the XFS max acl return errno Jeff Liu @ 2014-03-10 8:35 ` Christoph Hellwig 2014-03-10 20:53 ` Dave Chinner 1 sibling, 0 replies; 5+ messages in thread From: Christoph Hellwig @ 2014-03-10 8:35 UTC (permalink / raw) To: Jeff Liu; +Cc: xfs@oss.sgi.com On Mon, Mar 10, 2014 at 04:32:23PM +0800, Jeff Liu wrote: > From: Jie Liu <jeff.liu@oracle.com> > > Update the golden output to match the recently XFS return errno > changes if hit the limits of maximum number of ACLs. > > Signed-off-by: Jie Liu <jeff.liu@oracle.com> Thanks! Reviewed-by: Christoph Hellwig <hch@lst.de> _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xfstests: shared/051: update golden output to match the XFS max acl return errno 2014-03-10 8:32 [PATCH] xfstests: shared/051: update golden output to match the XFS max acl return errno Jeff Liu 2014-03-10 8:35 ` Christoph Hellwig @ 2014-03-10 20:53 ` Dave Chinner 2014-03-11 12:48 ` Jeff Liu 1 sibling, 1 reply; 5+ messages in thread From: Dave Chinner @ 2014-03-10 20:53 UTC (permalink / raw) To: Jeff Liu; +Cc: xfs@oss.sgi.com On Mon, Mar 10, 2014 at 04:32:23PM +0800, Jeff Liu wrote: > From: Jie Liu <jeff.liu@oracle.com> > > Update the golden output to match the recently XFS return errno > changes if hit the limits of maximum number of ACLs. > > Signed-off-by: Jie Liu <jeff.liu@oracle.com> > --- > tests/shared/051.out | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/shared/051.out b/tests/shared/051.out > index a871082..354ec6a 100644 > --- a/tests/shared/051.out > +++ b/tests/shared/051.out > @@ -280,7 +280,7 @@ mask::rwx > other::rwx > > 1 above xfs acl max > -chacl: cannot set access acl on "largeaclfile": Invalid argument > +chacl: cannot set access acl on "largeaclfile": Argument list too long That breaks the test on older kernels. Can you add a filter that kills the "Invalid argument"/"Argument list too long" part of the error message so the same golden output works for old and new kernels? Cheers, Dave. -- Dave Chinner david@fromorbit.com _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xfstests: shared/051: update golden output to match the XFS max acl return errno 2014-03-10 20:53 ` Dave Chinner @ 2014-03-11 12:48 ` Jeff Liu 2014-03-11 22:54 ` Dave Chinner 0 siblings, 1 reply; 5+ messages in thread From: Jeff Liu @ 2014-03-11 12:48 UTC (permalink / raw) To: Dave Chinner; +Cc: xfs@oss.sgi.com On 03/11 2014 04:53 AM, Dave Chinner wrote: > On Mon, Mar 10, 2014 at 04:32:23PM +0800, Jeff Liu wrote: >> From: Jie Liu <jeff.liu@oracle.com> >> >> Update the golden output to match the recently XFS return errno >> changes if hit the limits of maximum number of ACLs. >> >> Signed-off-by: Jie Liu <jeff.liu@oracle.com> >> --- >> tests/shared/051.out | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tests/shared/051.out b/tests/shared/051.out >> index a871082..354ec6a 100644 >> --- a/tests/shared/051.out >> +++ b/tests/shared/051.out >> @@ -280,7 +280,7 @@ mask::rwx >> other::rwx >> >> 1 above xfs acl max >> -chacl: cannot set access acl on "largeaclfile": Invalid argument >> +chacl: cannot set access acl on "largeaclfile": Argument list too long > > That breaks the test on older kernels. Can you add a filter that > kills the "Invalid argument"/"Argument list too long" part of the > error message so the same golden output works for old and new > kernels? How about the following revised version? maybe I missed you comments of "kills the...". Thanks, -Jeff From: Jie Liu <jeff.liu@oracle.com> On old kernel we return EINVAL if hit the limits of maximum number of ACLs but return E2BIG on new kernel, which cause the current test fails on new kernel as the output is mismatch to the goldens. In order to make the current golden output works for both old and new kernels, this patch filter the new error message out to match the olds. Signed-off-by: Jie Liu <jeff.liu@oracle.com> --- tests/shared/051 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/shared/051 b/tests/shared/051 index e957f86..157eb9c 100755 --- a/tests/shared/051 +++ b/tests/shared/051 @@ -342,7 +342,10 @@ chacl $acl2 largeaclfile getfacl --numeric largeaclfile | _filter_aces echo "1 above xfs acl max" -chacl $acl3 largeaclfile +# we return E2BIG if hit the max acl limits on new kernel, but EINVAL +# on old kernel. So we need to filter the error message out in order +# to make the current golden output works for both old and new kernels. +chacl $acl3 largeaclfile 2>&1 | sed -e "s/Argument list too long/Invalid argument/" getfacl --numeric largeaclfile | _filter_aces echo "use 16 aces" -- 1.8.3.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] xfstests: shared/051: update golden output to match the XFS max acl return errno 2014-03-11 12:48 ` Jeff Liu @ 2014-03-11 22:54 ` Dave Chinner 0 siblings, 0 replies; 5+ messages in thread From: Dave Chinner @ 2014-03-11 22:54 UTC (permalink / raw) To: Jeff Liu; +Cc: xfs@oss.sgi.com On Tue, Mar 11, 2014 at 08:48:20PM +0800, Jeff Liu wrote: > > On 03/11 2014 04:53 AM, Dave Chinner wrote: > > On Mon, Mar 10, 2014 at 04:32:23PM +0800, Jeff Liu wrote: > >> From: Jie Liu <jeff.liu@oracle.com> > >> > >> Update the golden output to match the recently XFS return errno > >> changes if hit the limits of maximum number of ACLs. > >> > >> Signed-off-by: Jie Liu <jeff.liu@oracle.com> > >> --- > >> tests/shared/051.out | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/tests/shared/051.out b/tests/shared/051.out > >> index a871082..354ec6a 100644 > >> --- a/tests/shared/051.out > >> +++ b/tests/shared/051.out > >> @@ -280,7 +280,7 @@ mask::rwx > >> other::rwx > >> > >> 1 above xfs acl max > >> -chacl: cannot set access acl on "largeaclfile": Invalid argument > >> +chacl: cannot set access acl on "largeaclfile": Argument list too long > > > > That breaks the test on older kernels. Can you add a filter that > > kills the "Invalid argument"/"Argument list too long" part of the > > error message so the same golden output works for old and new > > kernels? > > How about the following revised version? maybe I missed you comments of "kills the...". > > Thanks, > -Jeff > > > From: Jie Liu <jeff.liu@oracle.com> > > On old kernel we return EINVAL if hit the limits of maximum number of > ACLs but return E2BIG on new kernel, which cause the current test fails > on new kernel as the output is mismatch to the goldens. In order to make > the current golden output works for both old and new kernels, this patch > filter the new error message out to match the olds. > > Signed-off-by: Jie Liu <jeff.liu@oracle.com> > --- > tests/shared/051 | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tests/shared/051 b/tests/shared/051 > index e957f86..157eb9c 100755 > --- a/tests/shared/051 > +++ b/tests/shared/051 > @@ -342,7 +342,10 @@ chacl $acl2 largeaclfile > getfacl --numeric largeaclfile | _filter_aces > > echo "1 above xfs acl max" > -chacl $acl3 largeaclfile > +# we return E2BIG if hit the max acl limits on new kernel, but EINVAL > +# on old kernel. So we need to filter the error message out in order > +# to make the current golden output works for both old and new kernels. > +chacl $acl3 largeaclfile 2>&1 | sed -e "s/Argument list too long/Invalid argument/" > getfacl --numeric largeaclfile | _filter_aces Good, but normally that's done like: # we return E2BIG if hit the max acl limits on new kernel, but EINVAL # on old kernel. So we need to filter the error message out in order # to make the current golden output works for both old and new kernels. _filter_largeacl() { sed -e "s/Argument list too long/Invalid argument/" } .... chacl $acl3 largeaclfile 2>&1 | _filter_largeacl Cheers, Dave. -- Dave Chinner david@fromorbit.com _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-11 22:54 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-10 8:32 [PATCH] xfstests: shared/051: update golden output to match the XFS max acl return errno Jeff Liu 2014-03-10 8:35 ` Christoph Hellwig 2014-03-10 20:53 ` Dave Chinner 2014-03-11 12:48 ` Jeff Liu 2014-03-11 22:54 ` Dave Chinner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).