Debug: fix showing option name for list (vs. list content)

[exim.git] / test / stderr / 0332

diff --git a/test/stderr/0332 b/test/stderr/0332
index 0dbc12994251ec9a6e73102f4e94f5892be2b084..c69ae4a60d5765576e8592f0fc42691f19496ea0 100644 (file)
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -3,9 +3,7 @@ configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
-  Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+  Start queue run: pid=p1234
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
@@ -23,7 +21,7 @@ set transport t1
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=no.delay local_part_data=NULL
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1
@@ -34,23 +32,14 @@ After routing:
     ok@no.delay
   Failed addresses:
   Deferred addresses:
-qrun delivery forking for transport
-postfork: transport
 locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile
-transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
+ locking /home/jgh/local_git/exim/test/spool/db/wait-t1.lockfile
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -61,7 +50,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN
-  == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer
+  == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay
@@ -78,7 +67,7 @@ set transport t1
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=no.delay local_part_data=NULL
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1
@@ -90,22 +79,18 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
-continued-transport forking for transport
-postfork: transport
 locking TESTSUITE/spool/db/retry.lockfile
-continued-transport forked for transport: npppp
 locking TESTSUITE/spool/db/wait-t1.lockfile
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+>>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN
-  == delay@test.again.dns routing defer (-51): retry time not reached
+  == delay@test.again.dns routing defer (-52): retry time not reached
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -113,8 +98,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
-  End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>