Skip to contentSkip to conversation

xfstests: add missing colon in _filter_ln

PATCH In review Eryu Guan 3 participants 3 messages May 29, 2013

lore
Share & tools
lore

Eryu Guan

author
#0 lore raw

PATCH 1/1 xfstests: add missing colon in _filter_ln

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.

---
 common/filter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/filter +1 -1
index bdd6427..dbb1674 100644
@@ -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,"
 }
 
Signature · 6 lines
1.8.2.1

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · 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.

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.

-Eric

Quoted 11 lines
---
 common/filter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/filter +0 -0
index bdd6427..dbb1674 100644

common/filter _filter_spaces() · line 249

Quoted 8 lines
common/filter +1 -1
@@ -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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#2 lore raw
In reply to Eryu Guan
Quoted 8 lines · 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.

Thanks for the patch, it has been committed:

commit 3f09dca681eb0cdd850abbcdb4d6997a0890b09a

Author: Eryu Guan <[email protected]>
Date:   Wed May 29 14:42:09 2013 -0500

xfstests: add missing colon in _filter_ln

--Rich

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs