Testsuite: more munging for mailq output

diff --git a/test/runtest b/test/runtest
index 8ad86365dca7e51ee4caf378cb915c8eae6e026c..bc570842a91bdbe5b1313a128b3137fb4b359c86 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -891,7 +891,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   s/([\s,])S=\d+\b/$1S=sss/;
   s/:S\d+\b/:Ssss/;
-  s/^(\s*\d+m\s+)\d+(\s+[a-z0-9-]{23} <)/$1sss$2/i if $is_stdout;
+  s/^(\s*\d+[mhd]\s+)\d+(\s+[a-z0-9-]{23} <)/TTT   sss$2/i if $is_stdout;
   s/\sSIZE=\d+\b/ SIZE=ssss/;
   s/\ssize=\d+\b/ size=sss/ if $is_stderr;
   s/old size = \d+\b/old size = sssss/;

diff --git a/test/stdout/0022 b/test/stdout/0022
index adb4b169aa1aaa06758ced1fa8860f79c7805a92..e7a1bc6d722782b87789833babce4549bfd92aed 100644 (file)
--- a/test/stdout/0022
+++ b/test/stdout/0022
@@ -127,11 +127,11 @@
 250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 550 forcibly dropped\r
- 0m   304 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen ***
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen ***
           accept@y
           freeze@y
 
- 0m   306 10HmaZ-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@test.ex>
           queue_only@y
           accept@y
 
@@ -213,26 +213,26 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
- 0m   304 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen ***
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen ***
           accept@y
           freeze@y
 
- 0m   306 10HmaZ-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@test.ex>
           queue_only@y
           accept@y
 
- 0m   174 10HmbB-000000005vi-0000 <x@y> *** frozen ***
+TTT   sss 10HmbB-000000005vi-0000 <x@y> *** frozen ***
           accept@y
           freeze@y
 
- 0m   190 10HmbC-000000005vi-0000 <x@y>
+TTT   sss 10HmbC-000000005vi-0000 <x@y>
           accept@y
 
- 0m   176 10HmbD-000000005vi-0000 <x@y>
+TTT   sss 10HmbD-000000005vi-0000 <x@y>
           queue_only@y
           accept@y
 
- 0m   190 10HmbE-000000005vi-0000 <x@y>
+TTT   sss 10HmbE-000000005vi-0000 <x@y>
           accept@y
 
 Connecting to 127.0.0.1 port 1225 ... connected

diff --git a/test/stdout/0037 b/test/stdout/0037
index dea414c6a83533ff0ce8945af0e14faace73e743..5fe47ee952d1849dd58f0f57633410ba3ee684cc 100644 (file)
--- a/test/stdout/0037
+++ b/test/stdout/0037
@@ -211,7 +211,7 @@ Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-5"
 Testprint: Before fail
 Fail text "This is a forced failure"
 Filtering ended by "fail".
- 0m   sss 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen ***
+TTT   sss 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen ***
           userx@test.ex
        +D system-filter
        +D userz@test.ex

diff --git a/test/stdout/0154 b/test/stdout/0154
index 8bce51df9f1a68b196ecb59e5c4dc4d61b368d0e..6587d3c3b67ce3ada7ee4e1e116a5ab20a127e4e 100644 (file)
--- a/test/stdout/0154
+++ b/test/stdout/0154
@@ -1,30 +1,30 @@
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
           a@test.ex
 
- 0m   sss 10HmaY-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@test.ex>
           b@test.ex
 
- 0m   sss 10HmaZ-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@test.ex>
           c@test.ex
 
- 0m   sss 10HmbA-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbA-000000005vi-0000 <CALLER@test.ex>
           d@test.ex
 
- 0m   sss 10HmbB-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@test.ex>
           e@test.ex
 
- 0m   sss 10HmbC-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@test.ex>
           f@test.ex
 
- 0m   sss 10HmbD-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbD-000000005vi-0000 <CALLER@test.ex>
           g@test.ex
 
- 0m   sss 10HmbE-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbE-000000005vi-0000 <CALLER@test.ex>
           h@test.ex
 
- 0m   sss 10HmbF-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbF-000000005vi-0000 <CALLER@test.ex>
           i@test.ex
 
- 0m   sss 10HmbG-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbG-000000005vi-0000 <CALLER@test.ex>
           j@test.ex
 

diff --git a/test/stdout/0155 b/test/stdout/0155
index 1d908c18e5a654e2177dd91ffdec8cbe6e2702cc..254b7e961e7c42ee804102d3387c13c71eeb710d 100644 (file)
--- a/test/stdout/0155
+++ b/test/stdout/0155
@@ -1,32 +1,32 @@
 ### exim -bp
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
           a@test.ex
 
- 0m   sss 10HmaY-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@test.ex>
           b@test.ex
 
- 0m   sss 10HmaZ-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@test.ex>
           c@test.ex
 
- 0m   sss 10HmbA-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbA-000000005vi-0000 <CALLER@test.ex>
           d@test.ex
 
- 0m   sss 10HmbB-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@test.ex>
           e@test.ex
 
- 0m   sss 10HmbC-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@test.ex>
           f@test.ex
 
- 0m   sss 10HmbD-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbD-000000005vi-0000 <CALLER@test.ex>
           g@test.ex
 
- 0m   sss 10HmbE-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbE-000000005vi-0000 <CALLER@test.ex>
           h@test.ex
 
- 0m   sss 10HmbF-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbF-000000005vi-0000 <CALLER@test.ex>
           i@test.ex
 
- 0m   sss 10HmbG-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmbG-000000005vi-0000 <CALLER@test.ex>
           j@test.ex
 
 ### exim -bpi

diff --git a/test/stdout/0177 b/test/stdout/0177
index ca13f65d8fe19ddb4c7025457dd46bf3d095d6c3..26fd516c552df2cdbe84cef884d08ecd035370d2 100644 (file)
--- a/test/stdout/0177
+++ b/test/stdout/0177
@@ -1,8 +1,8 @@
- 0m   sss 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen ***
+TTT   sss 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen ***
           userx@test.ex
        +D >usery:userx@test.ex
 
- 0m   sss 10HmbG-000000005vi-0000 <CALLER@test.ex> *** frozen ***
+TTT   sss 10HmbG-000000005vi-0000 <CALLER@test.ex> *** frozen ***
           userz@test.ex
 
 

diff --git a/test/stdout/0185 b/test/stdout/0185
index 5a909a1e3708fe1570067c28f33bd51aa2e2ae86..68425b415e51c0f913bacc61182df673bdacc0a1 100644 (file)
--- a/test/stdout/0185
+++ b/test/stdout/0185
@@ -1,4 +1,4 @@
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen ***
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen ***
           usery@test.ex
 
 

diff --git a/test/stdout/0220 b/test/stdout/0220
index f5456cdf9ce14faf6fc4d52b67030f193c71b14c..78aee946496efbd24320f31dfc21447f45e472a5 100644 (file)
--- a/test/stdout/0220
+++ b/test/stdout/0220
@@ -5,12 +5,12 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbA-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
- 0m   280 10HmbC-000000005vi-0000 <> (CALLER)
+TTT   sss 10HmbC-000000005vi-0000 <> (CALLER)
           userx@myhost.test.ex
 
- 0m   337 10HmbD-000000005vi-0000 <foo@bar> (CALLER)
+TTT   sss 10HmbD-000000005vi-0000 <foo@bar> (CALLER)
           userx@myhost.test.ex
 
- 0m   242 10HmbE-000000005vi-0000 <>
+TTT   sss 10HmbE-000000005vi-0000 <>
           userx@myhost.test.ex
 

diff --git a/test/stdout/0221 b/test/stdout/0221
index 723443dbc2a6136bc06f7df05e414f47b067066b..5381fe7dd1b11707a88fc3dc172807fc96573cef 100644 (file)
--- a/test/stdout/0221
+++ b/test/stdout/0221
@@ -5,12 +5,12 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbA-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
- 0m   280 10HmbC-000000005vi-0000 <> (CALLER)
+TTT   sss 10HmbC-000000005vi-0000 <> (CALLER)
           userx@myhost.test.ex
 
- 0m   318 10HmbD-000000005vi-0000 <CALLER@myhost.test.ex>
+TTT   sss 10HmbD-000000005vi-0000 <CALLER@myhost.test.ex>
           userx@myhost.test.ex
 
- 0m   242 10HmbE-000000005vi-0000 <>
+TTT   sss 10HmbE-000000005vi-0000 <>
           userx@myhost.test.ex
 

diff --git a/test/stdout/0245 b/test/stdout/0245
index b34ec1aa37295428fdda2500ff3de46672493b55..03bc5ec48dd885298c9aa991d7c5ac77058fc1a8 100644 (file)
--- a/test/stdout/0245
+++ b/test/stdout/0245
@@ -1,4 +1,4 @@
- 0m   334 10HmaX-000000005vi-0000 <CALLER@myhost.test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@myhost.test.ex>
           "abc   def"@test.ex
           xxx@yyy
           aaa@bbb

diff --git a/test/stdout/0302 b/test/stdout/0302
index 02ac75dc2d2c113f2c4dc2c8309b88d905899f0d..74ec307ea9c554b074f65198fc81846b9b453394 100644 (file)
--- a/test/stdout/0302
+++ b/test/stdout/0302
@@ -1,4 +1,4 @@
- 0m   302 10HmaX-000000005vi-0000 <CALLER@myhost.test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@myhost.test.ex>
         D abcd@myhost.test.ex
           defer@myhost.test.ex
 

diff --git a/test/stdout/0317 b/test/stdout/0317
index abb4cb59e702619260d823dcd5f52a07350023b0..f10ec7965ad6e993ef6adfacc7320216f9127be0 100644 (file)
--- a/test/stdout/0317
+++ b/test/stdout/0317
@@ -1,9 +1,9 @@
- 0m   294 10HmaX-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
           x@y.z
           a@b.c
           p@q.r
 
- 0m   366 10HmaY-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@test.ex>
           aa@bb.cc
           pp@qq.rr
           xx@yy.zz

diff --git a/test/stdout/0338 b/test/stdout/0338
index 813c272b7900e9e78b011f13583d22637ee2c27b..e33aeeeb2c74634e68f12f8d8feda898e536cd2f 100644 (file)
--- a/test/stdout/0338
+++ b/test/stdout/0338
@@ -1,4 +1,4 @@
- 0m   297 10HmaX-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
         D userx@test.ex
           a1-userx@test.ex
 

diff --git a/test/stdout/0360 b/test/stdout/0360
index 48f87eb1763bb9caf6999ec18199b090c976c703..885ee74564041a3699b6c8700b8e5776395c8d91 100644 (file)
--- a/test/stdout/0360
+++ b/test/stdout/0360
@@ -1,4 +1,4 @@
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
           cms@test.ex
        +D unknown@recurse.test.ex
        +D unknown@recurse.test.ex.test.ex

diff --git a/test/stdout/0465 b/test/stdout/0465
index 1a65979deca260a24e52d88136dffe7bb9cd7acd..0f81b189e6f81a50571999395f031f252e0550c9 100644 (file)
--- a/test/stdout/0465
+++ b/test/stdout/0465
@@ -17,9 +17,9 @@
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
- 0m   265 10HmaY-000000005vi-0000 <>
+TTT   sss 10HmaY-000000005vi-0000 <>
           abc@domain
 
- 0m   281 10HmaZ-000000005vi-0000 <abc@somewhere>
+TTT   sss 10HmaZ-000000005vi-0000 <abc@somewhere>
           xxx@yyy
 

diff --git a/test/stdout/0514 b/test/stdout/0514
index db13b7e1a226c15edd3976174403da77daa8e098..516e882b3fbf52e65fc570651eb80b7a47d58b86 100644 (file)
--- a/test/stdout/0514
+++ b/test/stdout/0514
@@ -1,4 +1,4 @@
- 0m   356 10HmaX-000000005vi-0000 <"spaced user"@myhost.test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <"spaced user"@myhost.test.ex>
           userx@myhost.test.ex
 
 10HmaX-000000005vi-0000-H

diff --git a/test/stdout/0576 b/test/stdout/0576
index 5021e089f6e134522ee8e8688f2c08566b9a271c..cae3620b187b5a681aefce3749372ba500d3c577 100644 (file)
--- a/test/stdout/0576
+++ b/test/stdout/0576
@@ -11,11 +11,11 @@
 250 OK id=10HmaY-000000005vi-0000\r
 221 the.local.host.name closing connection\r
 ### default q
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@the.local.host.name>
           normal@test.ex
 
 ### alternate q
- 0m   sss 10HmaY-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@the.local.host.name>
           alternate@test.ex
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
@@ -46,11 +46,11 @@
 250 OK id=10HmbC-000000005vi-0000\r
 221 the.local.host.name closing connection\r
 ### default q
- 0m   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
           normal@test.ex
 
 ### alternate q
- 0m   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
           alternate@test.ex
 
 ### move msg from default to third q
@@ -58,18 +58,18 @@ Message 10HmbB-000000005vi-0000
 ### move msg from alternate q to third q
 Message 10HmbC-000000005vi-0000 
 ### third q
- 0m   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
           normal@test.ex
 
- 0m   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
           alternate@test.ex
 
 Message 10HmbB-000000005vi-0000 Message 10HmbC-000000005vi-0000 
 ### default q
- 0m   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
           normal@test.ex
 
- 0m   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
           alternate@test.ex
 
 ### alternate q

diff --git a/test/stdout/0611 b/test/stdout/0611
index 49e48d4cfaafce48e218212bf29bb683e32349ca..a9a3126cf14a3ca4ce3f02e12bd8b3e380207d77 100644 (file)
--- a/test/stdout/0611
+++ b/test/stdout/0611
@@ -24,7 +24,7 @@ Display options:
        -R              Reverse order
        -a              All recipients (including delivered)
 exiqgrep exit code = 0
- 0m   278 10HmaX-000000005vi-0000 <CALLER@test.ex>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex>
          a@test.ex
          b@test.ex
          c@test.ex

diff --git a/test/stdout/0699 b/test/stdout/0699
index 296d7f70c42204da298dab3cabdab26e2d97e4c5..c8434157bc9c6374984b939cf8a0941e403ba948 100644 (file)
--- a/test/stdout/0699
+++ b/test/stdout/0699
@@ -1,4 +1,4 @@
- 0m   396 10HmaX-000000005vi-0000 <CALLER@the.local.host.name>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@the.local.host.name>
           nulldeliver@test.ex
 
 exim_id_update exit code = 0
@@ -6,6 +6,6 @@ exim_id_update exit code = 0
           nulldeliver@test.ex
 
 exim_id_update exit code = 0
-DDd   317 10HmaY-000000005vi-0000 <nobody@test.ex>
+TTT   sss 10HmaY-000000005vi-0000 <nobody@test.ex>
           nulldeliver@test.ex
 

diff --git a/test/stdout/5300 b/test/stdout/5300
index 9e7dc1fc07aeadfea376f2b1ba254204440ebdff..aacfbf2d1731720a72dfe41145dcc0e92c3af519 100644 (file)
--- a/test/stdout/5300
+++ b/test/stdout/5300
@@ -3,7 +3,7 @@ x@[V4NET.9.8.7]
   host [V4NET.9.8.7] [V4NET.9.8.7]
 x@[127.0.0.1]
   router = r3, transport = t1
- 0m   282 10HmaX-000000005vi-0000 <y@[10.9.8.7]>
+TTT   sss 10HmaX-000000005vi-0000 <y@[10.9.8.7]>
           zz@test.ex
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r