git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
runtest - trim trailing whitespace from otherwise un-rewritten host lines in munge...
[users/jgh/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index affd82ad485431bab84c5b2494256e4b18e08adf..9d034169c9e64bf193266404ca53a5a958b54de7 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1,6
+1,6
@@
#! /usr/bin/perl -w
#! /usr/bin/perl -w
-# $Cambridge: exim/test/runtest,v 1.3
3 2009/11/23 13:22:05 nm4
Exp $
+# $Cambridge: exim/test/runtest,v 1.3
5 2010/06/05 01:58:39 jetmore
Exp $
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@
-23,9
+23,9
@@
use Socket;
# Start by initializing some global variables
# Start by initializing some global variables
-$testversion = "4.7
1 (23-Nov-09
)";
+$testversion = "4.7
2 (02-Jun-10
)";
-$cf = "bin/cf";
+$cf = "bin/cf
-exact
";
$cr = "\r";
$debug = 0;
$force_update = 0;
$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.
# 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/;
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/\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 ========
# ======== Test network IP addresses ========
@@
-727,6
+731,10
@@
while(<IN>)
next if /GnuTLS compile-time version: \d+[\.\d]+$/;
next if /GnuTLS runtime version: \d+[\.\d]+$/;
next if /GnuTLS compile-time version: \d+[\.\d]+$/;
next if /GnuTLS runtime version: \d+[\.\d]+$/;
+ # drop openssl version strings
+ next if /OpenSSL compile-time version: OpenSSL \d+[\.\da-z]+/;
+ next if /OpenSSL runtime version: OpenSSL \d+[\.\da-z]+/;
+
# We have to omit the localhost ::1 address so that all is well in
# the IPv4-only case.
# We have to omit the localhost ::1 address so that all is well in
# the IPv4-only case.