summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b3f43fa)
0190, 0244, 0297, 0350, 0430 - standardize trailing whitespace
0403 - lingering header order fix, fix change in lookup type encoding after dkim lookup type removal
-# $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 #
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
$testversion = "4.72 (02-Jun-10)";
$testversion = "4.72 (02-Jun-10)";
$cr = "\r";
$debug = 0;
$force_update = 0;
$cr = "\r";
$debug = 0;
$force_update = 0;
# 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/;
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 ========
From: CALLER_NAME <CALLER@test.ex>
search_tidyup called
>>Headers after rewriting and local additions:
From: CALLER_NAME <CALLER@test.ex>
search_tidyup called
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
F From: CALLER_NAME <CALLER@test.ex>
I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
F From: CALLER_NAME <CALLER@test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
search_find: file="TESTSUITE/aux-fixed/0403.data"
key="test.ex" partial=-1 affix=NULL starflags=0
LRU list:
search_find: file="TESTSUITE/aux-fixed/0403.data"
key="test.ex" partial=-1 affix=NULL starflags=0
LRU list:
- ;TESTSUITE/aux-fixed/0403.data
+ :TESTSUITE/aux-fixed/0403.data
End
internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
type=lsearch key="test.ex"
End
internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
type=lsearch key="test.ex"
search_find: file="TESTSUITE/aux-fixed/0403.data"
key="userx" partial=-1 affix=NULL starflags=0
LRU list:
search_find: file="TESTSUITE/aux-fixed/0403.data"
key="userx" partial=-1 affix=NULL starflags=0
LRU list:
- ;TESTSUITE/aux-fixed/0403.data
+ :TESTSUITE/aux-fixed/0403.data
End
internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
type=lsearch key="userx"
End
internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
type=lsearch key="userx"
userx@bdomain1
router = r3, transport = smtp2
host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
userx@bdomain1
router = r3, transport = smtp2
host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
- host 127.0.0.1 [127.0.0.1]
+ host 127.0.0.1 [127.0.0.1]
host the.local.host.name [ip4.ip4.ip4.ip4]
userx@bdomain2
router = r3, transport = smtp2
host the.local.host.name [ip4.ip4.ip4.ip4]
host the.local.host.name [ip4.ip4.ip4.ip4]
userx@bdomain2
router = r3, transport = smtp2
host the.local.host.name [ip4.ip4.ip4.ip4]
- host 127.0.0.1 [127.0.0.1]
+ host 127.0.0.1 [127.0.0.1]
host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
userx@bdomain3
router = r3, transport = smtp2
host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
userx@bdomain3
router = r3, transport = smtp2
host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
- host 127.0.0.1 [127.0.0.1]
+ host 127.0.0.1 [127.0.0.1]
host the.local.host.name [ip4.ip4.ip4.ip4]
******** SERVER ********
host the.local.host.name [ip4.ip4.ip4.ip4]
******** SERVER ********
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
->
\ No newline at end of file
-/a/b/c@myhost.test.ex -> /a/b/c
+/a/b/c@myhost.test.ex -> /a/b/c
-/x/y/z@myhost.test.ex -> /x/y/z
+/x/y/z@myhost.test.ex -> /x/y/z
-/a/b/c/@myhost.test.ex -> /a/b/c/
+/a/b/c/@myhost.test.ex -> /a/b/c/
-/a/a/b//@myhost.test.ex -> /a/a/b//
+/a/a/b//@myhost.test.ex -> /a/a/b//
xx@yy
router = r1, transport = t1
xx@yy
router = r1, transport = t1
host other2.test.ex [V4NET.12.3.2]
host other2.test.ex [V4NET.12.3.2]
router = r1, transport = t1
host ten-1.test.ex [V4NET.0.0.1] MX=5
host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
router = r1, transport = t1
host ten-1.test.ex [V4NET.0.0.1] MX=5
host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
- host ten-6.test.ex [V4NET.0.0.6]
+ host ten-6.test.ex [V4NET.0.0.6]
x@manual.route is undeliverable: lowest numbered MX record points to local host
x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router
x@random.manual.route
x@manual.route is undeliverable: lowest numbered MX record points to local host
x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router
x@random.manual.route