runtest - trim trailing whitespace from otherwise un-rewritten host lines in munge...

0190, 0244, 0297, 0350, 0430 - standardize trailing whitespace
0403 - lingering header order fix, fix change in lookup type encoding after dkim lookup type removal

diff --git a/test/runtest b/test/runtest
index 5b852d6eeaf029ea0030501330494b4327ce0a02..9d034169c9e64bf193266404ca53a5a958b54de7 100755 (executable)
--- 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 ========

diff --git a/test/stderr/0403 b/test/stderr/0403
index 718e5716325426cb4c4d0494c26ab51b18e944cc..7d132041a1de7566015990229358f715c4f68462 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   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>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
@@ -80,7 +80,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
 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"
@@ -94,7 +94,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
 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"

diff --git a/test/stdout/0190 b/test/stdout/0190
index fa9ad7c5a1b0fc57113f7887e51dda4af383bcd7..4ca02adc5ec0ce6d6ba4071983f01fe2503d5d2b 100644 (file)
--- a/test/stdout/0190
+++ b/test/stdout/0190
@@ -97,17 +97,17 @@ y@batch4
 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 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 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 ********
@@ -126,9 +126,9 @@ DATA
 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>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -151,9 +151,9 @@ DATA
 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>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -176,9 +176,9 @@ DATA
 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>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -203,9 +203,9 @@ DATA
 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>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -228,9 +228,9 @@ DATA
 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>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -257,9 +257,9 @@ DATA
 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>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .

diff --git a/test/stdout/0244 b/test/stdout/0244
index 40eac3877bd405f57790d323e78b39e89fcdb9a7..aff9070e98a6344215c9c47e2643c54312679d5c 100644 (file)
--- a/test/stdout/0244
+++ b/test/stdout/0244
@@ -2,4 +2,4 @@
 > OK
 > OK
 > OK
-> 
\ No newline at end of file
+> 

diff --git a/test/stdout/0297 b/test/stdout/0297
index 060a8956b30bd006947560900b0ca152810c9ab5..d6947af8c802e19cb5515ac07dd5200b15cd934d 100644 (file)
--- a/test/stdout/0297
+++ b/test/stdout/0297
@@ -1,8 +1,8 @@
-/a/b/c@myhost.test.ex -> /a/b/c 
+/a/b/c@myhost.test.ex -> /a/b/c
   transport = tf1
-/x/y/z@myhost.test.ex -> /x/y/z 
+/x/y/z@myhost.test.ex -> /x/y/z
   transport = tf2
-/a/b/c/@myhost.test.ex -> /a/b/c/ 
+/a/b/c/@myhost.test.ex -> /a/b/c/
   transport = td1
-/a/a/b//@myhost.test.ex -> /a/a/b// 
+/a/a/b//@myhost.test.ex -> /a/a/b//
   transport = td2

diff --git a/test/stdout/0350 b/test/stdout/0350
index b17b1bebe29ca2e792878869dd281cd40cf349dc..71109bd860a4c9f3030beb9e63440597df7da117 100644 (file)
--- a/test/stdout/0350
+++ b/test/stdout/0350
@@ -1,4 +1,4 @@
 xx@yy
   router = r1, transport = t1
-  host 1.2.3.4 [1.2.3.4]    
+  host 1.2.3.4 [1.2.3.4] 
   host other2.test.ex [V4NET.12.3.2] 

diff --git a/test/stdout/0430 b/test/stdout/0430
index 8281df8efe8aede9a10ebc84d2471a5c6e43d85f..de305666474e46f8618cc2d56a5d05db83e979e4 100644 (file)
--- a/test/stdout/0430
+++ b/test/stdout/0430
@@ -48,7 +48,7 @@ x@manual.route
   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