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

5 files changed, 16 insertions, 16 deletions

diff --git a/test/stdout/0190 b/test/stdout/0190
index fa9ad7c5a..4ca02adc5 100644
--- 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 40eac3877..aff9070e9 100644
--- 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 060a8956b..d6947af8c 100644
--- 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 b17b1bebe..71109bd86 100644
--- 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 8281df8ef..de3056664 100644
--- 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