Handle alternate access method flag in ls.

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 4543915b0de6af3954e4feaf3b9bf7d79731071e..2a8dd160c809117ee965089539a9fdc8a3e25f38 100755 (executable)
--- 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 =========