xfs
[Top] [All Lists]

Re: xfstests: ignore absolute address in filename in test case 237

To: xfs@xxxxxxxxxxx
Subject: Re: xfstests: ignore absolute address in filename in test case 237
From: Boris Ranto <branto@xxxxxxxxxx>
Date: Thu, 09 Dec 2010 14:40:47 +0100
In-reply-to: <1291899944.3196.11.camel@xxxxxxxxxxxxxxxxxxxxxxxxxx>
References: <1291899944.3196.11.camel@xxxxxxxxxxxxxxxxxxxxxxxxxx>
On Thu, 2010-12-09 at 14:05 +0100, Boris Ranto wrote: 
> Test case 237 checks for setfacl output. The setfacl can use both
> relative address or absolute address for filename.
> 
> Following patch ignores the unnecessary part of absolute address and
> therefore the test case can pass on systems that output absolute
> address:
> 
> diff -urpN a/xfstests/237 b/xfstests/237
> --- a/xfstests/237      2010-12-09 11:24:48.587432718 +0100
> +++ b/xfstests/237      2010-12-09 13:46:29.008245581 +0100
> @@ -72,7 +72,7 @@ touch file1
>  chown $acl1.$acl1 file1
> 
>  echo "Expect to FAIL"
> -$runas -u $acl2 -g $acl2 -- `which setfacl` -m u::rwx file1 2>&1
> +$runas -u $acl2 -g $acl2 -- `which setfacl` -m u::rwx file1 2>&1 | sed 
> 's/^setfacl: \/.*file1: Operation not permitted$/setfacl: file1: Operation 
> not permitted/'
> 
>  echo "Test over."
>  # success, all done
> 
> Signed-off-by: Boris Ranto <branto@xxxxxxxxxx>

I noticed that text is usually filtered in a little different way
therefore I'd rather suggest the following patch:

diff -urpN a/xfstests/237 b/xfstests/237
--- a/xfstests/237      2010-12-09 11:24:48.587432718 +0100
+++ b/xfstests/237      2010-12-09 14:24:09.463402051 +0100
@@ -47,6 +47,11 @@ _cleanup()
        _cleanup_testdir
 }
 
+# Allow absolute path in setfacl output
+_filter_absolute_path()
+{
+       sed 's/^setfacl: \/.*file1: Operation not permitted$/setfacl: file1: 
Operation not permitted/'
+}
 # real QA test starts here
 _supported_fs generic
 # only Linux supports fallocate
@@ -72,7 +77,7 @@ touch file1
 chown $acl1.$acl1 file1
 
 echo "Expect to FAIL"
-$runas -u $acl2 -g $acl2 -- `which setfacl` -m u::rwx file1 2>&1
+$runas -u $acl2 -g $acl2 -- `which setfacl` -m u::rwx file1 2>&1 | 
_filter_absolute_path
 
 echo "Test over."
 # success, all done


<Prev in Thread] Current Thread [Next in Thread>