[exim-dev] [Bug 1226] testsuite trips on ls output

Top Page

Reply to this message
Author: Git Commit
Date:  
To: exim-dev
Subject: [exim-dev] [Bug 1226] testsuite trips on ls output
------- You are receiving this mail because: -------
You are on the CC list for the bug.

http://bugs.exim.org/show_bug.cgi?id=1226

Git Commit <git@???> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |git@???





--- Comment #3 from Git Commit <git@???> 2012-03-30 22:17:12 ---
Git commit:
http://git.exim.org/exim.git/commitdiff/c1e49b796a61a19bc61e8c6349e90614690189a0

commit c1e49b796a61a19bc61e8c6349e90614690189a0
Author:     Phil Pennock <pdp@???>
AuthorDate: Fri Mar 30 13:52:17 2012 -0700
Commit:     Phil Pennock <pdp@???>
CommitDate: Fri Mar 30 13:52:17 2012 -0700


    Handle alternate access method flag in ls.


    Jeremy Harris found ls output not parsing on SELinux systems.  I
    identified this as SUSv3's "optional alternate access method flag".
    Jeremy wrote the patch, I adjusted a little.


    fixes bug 1226
---
 test/runtest |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/test/runtest b/test/runtest
index 4543915..2a8dd16 100755
--- a/test/runtest
+++ b/test/runtest
@@ -593,7 +593,12 @@ RESET_AFTER_EXTRA_LINE_READ:

# ======== Output from ls ========
# Different operating systems use different spacing on long output
- s/ +/ /g if /^[-rwd]{10} /;
+ #s/ +/ /g if /^[-rwd]{10} /;
+ # (Bug 1226) SUSv3 allows a trailing printable char for modified access
method control.
+ # Handle only the Gnu and MacOS space, dot, plus and at-sign. A full
[[:graph:]]
+ # unfortunately matches a non-ls linefull of dashes.
+ # Allow the case where we've already picked out the file protection bits.
+ s/^([-d](?:[-r][-w][-SsTtx]){3})[.+@]?( +|$)/\1 /;


# ======== Message sizes =========


--
Configure bugmail: http://bugs.exim.org/userprefs.cgi?tab=email