diff options
| -rwxr-xr-x | test/runtest | 2 | ||||
| -rw-r--r-- | test/stdout/0037 | 2 | ||||
| -rw-r--r-- | test/stdout/0154 | 20 | ||||
| -rw-r--r-- | test/stdout/0155 | 20 | ||||
| -rw-r--r-- | test/stdout/0177 | 4 | ||||
| -rw-r--r-- | test/stdout/0185 | 2 | ||||
| -rw-r--r-- | test/stdout/0360 | 2 | ||||
| -rw-r--r-- | test/stdout/0576 | 16 |
8 files changed, 34 insertions, 34 deletions
diff --git a/test/runtest b/test/runtest index 5e9f6c25c..c99320b6e 100755 --- a/test/runtest +++ b/test/runtest @@ -889,7 +889,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-]{16} <)/$1sss$2/i if $is_stdout; + s/^(\s*\d+m\s+)\d+(\s+[a-z0-9-]{23} <)/$1sss$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/0037 b/test/stdout/0037 index a1eea6563..dea414c6a 100644 --- 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 373 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen *** + 0m 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 45a40fdb7..8bce51df9 100644 --- a/test/stdout/0154 +++ b/test/stdout/0154 @@ -1,30 +1,30 @@ - 0m 293 10HmaX-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmaX-000000005vi-0000 <CALLER@test.ex> a@test.ex - 0m 293 10HmaY-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmaY-000000005vi-0000 <CALLER@test.ex> b@test.ex - 0m 293 10HmaZ-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmaZ-000000005vi-0000 <CALLER@test.ex> c@test.ex - 0m 293 10HmbA-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbA-000000005vi-0000 <CALLER@test.ex> d@test.ex - 0m 293 10HmbB-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbB-000000005vi-0000 <CALLER@test.ex> e@test.ex - 0m 293 10HmbC-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbC-000000005vi-0000 <CALLER@test.ex> f@test.ex - 0m 293 10HmbD-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbD-000000005vi-0000 <CALLER@test.ex> g@test.ex - 0m 293 10HmbE-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbE-000000005vi-0000 <CALLER@test.ex> h@test.ex - 0m 293 10HmbF-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbF-000000005vi-0000 <CALLER@test.ex> i@test.ex - 0m 293 10HmbG-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbG-000000005vi-0000 <CALLER@test.ex> j@test.ex diff --git a/test/stdout/0155 b/test/stdout/0155 index f2fb036d2..1d908c18e 100644 --- a/test/stdout/0155 +++ b/test/stdout/0155 @@ -1,32 +1,32 @@ ### exim -bp - 0m 293 10HmaX-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmaX-000000005vi-0000 <CALLER@test.ex> a@test.ex - 0m 293 10HmaY-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmaY-000000005vi-0000 <CALLER@test.ex> b@test.ex - 0m 293 10HmaZ-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmaZ-000000005vi-0000 <CALLER@test.ex> c@test.ex - 0m 293 10HmbA-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbA-000000005vi-0000 <CALLER@test.ex> d@test.ex - 0m 293 10HmbB-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbB-000000005vi-0000 <CALLER@test.ex> e@test.ex - 0m 293 10HmbC-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbC-000000005vi-0000 <CALLER@test.ex> f@test.ex - 0m 293 10HmbD-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbD-000000005vi-0000 <CALLER@test.ex> g@test.ex - 0m 293 10HmbE-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbE-000000005vi-0000 <CALLER@test.ex> h@test.ex - 0m 293 10HmbF-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbF-000000005vi-0000 <CALLER@test.ex> i@test.ex - 0m 293 10HmbG-000000005vi-0000 <CALLER@test.ex> + 0m sss 10HmbG-000000005vi-0000 <CALLER@test.ex> j@test.ex ### exim -bpi diff --git a/test/stdout/0177 b/test/stdout/0177 index f0eaf8553..ca13f65d8 100644 --- a/test/stdout/0177 +++ b/test/stdout/0177 @@ -1,8 +1,8 @@ - 0m 354 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen *** + 0m sss 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen *** userx@test.ex +D >usery:userx@test.ex - 0m 360 10HmbG-000000005vi-0000 <CALLER@test.ex> *** frozen *** + 0m sss 10HmbG-000000005vi-0000 <CALLER@test.ex> *** frozen *** userz@test.ex diff --git a/test/stdout/0185 b/test/stdout/0185 index e2f3c402d..5a909a1e3 100644 --- a/test/stdout/0185 +++ b/test/stdout/0185 @@ -1,4 +1,4 @@ - 0m 350 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen *** + 0m sss 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen *** usery@test.ex diff --git a/test/stdout/0360 b/test/stdout/0360 index 91810eb9b..48f87eb17 100644 --- a/test/stdout/0360 +++ b/test/stdout/0360 @@ -1,4 +1,4 @@ - 0m 295 10HmaX-000000005vi-0000 <CALLER@test.ex> + 0m 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/0576 b/test/stdout/0576 index 5fb18e930..5021e089f 100644 --- a/test/stdout/0576 +++ b/test/stdout/0576 @@ -11,11 +11,11 @@ 250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
### default q - 0m 348 10HmaX-000000005vi-0000 <CALLER@the.local.host.name> + 0m sss 10HmaX-000000005vi-0000 <CALLER@the.local.host.name> normal@test.ex ### alternate q - 0m 351 10HmaY-000000005vi-0000 <CALLER@the.local.host.name> + 0m 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
@@ -46,11 +46,11 @@ 250 OK id=10HmbC-000000005vi-0000
221 the.local.host.name closing connection
### default q - 0m 348 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> + 0m sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> normal@test.ex ### alternate q - 0m 351 10HmbC-000000005vi-0000 <CALLER@the.local.host.name> + 0m 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 348 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> + 0m sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> normal@test.ex - 0m 351 10HmbC-000000005vi-0000 <CALLER@the.local.host.name> + 0m sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name> alternate@test.ex Message 10HmbB-000000005vi-0000 Message 10HmbC-000000005vi-0000 ### default q - 0m 348 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> + 0m sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> normal@test.ex - 0m 351 10HmbC-000000005vi-0000 <CALLER@the.local.host.name> + 0m sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name> alternate@test.ex ### alternate q |