[PATCH] xfstests: add missing colon in _filter_ln

[PATCH] xfstests: add missing colon in _filter_ln

[Eryu Guan]

On distros with older coreutils(eg. RHEL5) generic/294 fails like

    -ln: creating symbolic link `SCRATCH_MNT/294.test/testlink': File exists
    +ln: creating symbolic link `SCRATCH_MNT/294.test/testlink'File exists

_filter_ln ate the ": ". xfs/103 has similar issue. Add ": " back.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 common/filter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/filter b/common/filter
index bdd6427..dbb1674 100644
--- a/common/filter
+++ b/common/filter
@@ -243,7 +243,7 @@ _filter_spaces()
 # Account for different "ln" failure messages
 _filter_ln()
 {
-	sed -e "s,\(creating symbolic link .*\) to .*: ,\1," \
+	sed -e "s,\(creating symbolic link .*\) to .*: ,\1: ," \
 	    -e "s,failed to create,creating,"
 }
 
-- 
1.8.2.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: add missing colon in _filter_ln

[Eric Sandeen]

On 5/29/13 10:41 AM, Eryu Guan wrote:
> On distros with older coreutils(eg. RHEL5) generic/294 fails like
> 
>     -ln: creating symbolic link `SCRATCH_MNT/294.test/testlink': File exists
>     +ln: creating symbolic link `SCRATCH_MNT/294.test/testlink'File exists
> 
> _filter_ln ate the ": ". xfs/103 has similar issue. Add ": " back.

Ok, so older coreutils does i.e.:

ln: creating symbolic link `b' to `a': File exists

and newer:

ln: creating symbolic link `b': File exists

We want to convert the older output to the newer, by removing the " to `a'" part.

Seems like my sed script is the long way around that ;)

Still, looks like your fix does the right thing, thanks.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

-Eric

> Signed-off-by: Eryu Guan <eguan@redhat.com>
> ---
>  common/filter | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/filter b/common/filter
> index bdd6427..dbb1674 100644
> --- a/common/filter
> +++ b/common/filter
> @@ -243,7 +243,7 @@ _filter_spaces()
>  # Account for different "ln" failure messages
>  _filter_ln()
>  {
> -	sed -e "s,\(creating symbolic link .*\) to .*: ,\1," \
> +	sed -e "s,\(creating symbolic link .*\) to .*: ,\1: ," \
>  	    -e "s,failed to create,creating,"
>  }
>  
> 

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: add missing colon in _filter_ln

[Rich Johnston]

On 05/29/2013 10:41 AM, Eryu Guan wrote:
> On distros with older coreutils(eg. RHEL5) generic/294 fails like
>
>      -ln: creating symbolic link `SCRATCH_MNT/294.test/testlink': File exists
>      +ln: creating symbolic link `SCRATCH_MNT/294.test/testlink'File exists
>
> _filter_ln ate the ": ". xfs/103 has similar issue. Add ": " back.
>
> Signed-off-by: Eryu Guan <eguan@redhat.com>

Thanks for the patch, it has been committed:

commit 3f09dca681eb0cdd850abbcdb4d6997a0890b09a
Author: Eryu Guan <eguan@redhat.com>
Date:   Wed May 29 14:42:09 2013 -0500

     xfstests: add missing colon in _filter_ln

--Rich

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs