Testsuite: munge for non-WITH_CONTENT_SCAN builds

[exim.git] / test / stderr / 0333

diff --git a/test/stderr/0333 b/test/stderr/0333
index 39605663fc82edc52ded92e24319d03ced7be882..0ddd349a332e6758b90d231795a99c15ab75067b 100644 (file)
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -19,7 +19,7 @@ set transport t1
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
 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
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1


@@ -30,19 +30,14 @@ After routing:
     ok@no.delay
   Failed addresses:
   Deferred addresses:
     ok@no.delay
   Failed addresses:
   Deferred addresses:

-fresh-exec forking for transport
-fresh-exec forked for transport: npppp

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile

-transport forking for continued-transport-interproc
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forking for continued-transport
-continued-transport-interproc forked for continued-transport: npppp
+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
 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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -53,7 +48,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN
 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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay


@@ -70,7 +65,7 @@ set transport t1
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
 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
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1


@@ -82,10 +77,9 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns

-continued-transport forking for transport
-continued-transport forked for transport: npppp

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 locking TESTSUITE/spool/db/retry.lockfile
 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"
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"

->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>