diff options
author | John Jetmore <jj33@pobox.com> | 2010-06-05 01:58:39 +0000 |
---|---|---|
committer | John Jetmore <jj33@pobox.com> | 2010-06-05 01:58:39 +0000 |
commit | 37acd760db257c134df6dad0fbb730b24b4b7e19 (patch) | |
tree | 3cf7309d330dc2564ac5abfc68576773a49ad23b /test/runtest | |
parent | b3f43fa01b5b8511bf22ff4781e6194cf2a5ab54 (diff) |
runtest - trim trailing whitespace from otherwise un-rewritten host lines in munge function
0190, 0244, 0297, 0350, 0430 - standardize trailing whitespace
0403 - lingering header order fix, fix change in lookup type encoding after dkim lookup type removal
Diffstat (limited to 'test/runtest')
-rwxr-xr-x | test/runtest | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest index 5b852d6ee..9d034169c 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.34 2010/06/03 02:42:19 jetmore Exp $ +# $Cambridge: exim/test/runtest,v 1.35 2010/06/05 01:58:39 jetmore Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -25,7 +25,7 @@ use Socket; $testversion = "4.72 (02-Jun-10)"; -$cf = "bin/cf"; +$cf = "bin/cf -exact"; $cr = "\r"; $debug = 0; $force_update = 0; @@ -548,6 +548,9 @@ while(<IN>) # The amount of space between "host" and the address in verification output # depends on the length of the host name. We therefore reduce it to one space # for all of them. + # Also, the length of space at the end of the host line is dependent + # on the length of the longest line, so strip it also on otherwise + # un-rewritten lines like localhost s/^\s+host\s(\S+)\s+(\S+)/ host $1 $2/; s/^\s+(host\s\S+\s\S+)\s+(port=.*)/ host $1 $2/; @@ -558,6 +561,7 @@ while(<IN>) s/\b\Q$parm_ipv6\E\b/ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6/g; s/\b\Q$parm_ipv4r\E\b/ip4-reverse/g; s/\b\Q$parm_ipv6r\E\b/ip6-reverse/g; + s/^(\s+host\s\S+\s+\[\S+\]) +$/$1 /; # ======== Test network IP addresses ======== |