[exim-cvs] Debug: process exits

Gitweb: https://git.exim.org/exim.git/commitdiff/b6bc7293f473a99a5023698741200c79a375a915

Commit:     b6bc7293f473a99a5023698741200c79a375a915
Parent:     39c5daead77c9c002625d28333f6bef1e5f7400c
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Jun 13 13:06:05 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Jun 13 20:07:08 2024 +0100

    Debug: process exits
---
 src/src/daemon.c                   |  2 +-
 src/src/deliver.c                  |  5 ++--
 src/src/exim.c                     | 16 +++++------
 src/src/exim_dbmbuild.c            | 10 +++----
 src/src/exim_dbutil.c              |  4 +--
 src/src/exim_lock.c                | 12 ++++----
 src/src/log.c                      |  2 +-
 src/src/pdkim/signing.c            |  2 +-
 src/src/readconf.c                 |  4 +--
 src/src/route.c                    |  3 +-
 src/src/routers/accept.c           |  9 ++++--
 src/src/routers/rf_get_transport.c |  2 +-
 test/stderr/0021                   |  1 +
 test/stderr/0037                   |  1 +
 test/stderr/0143                   |  1 +
 test/stderr/0169                   |  1 +
 test/stderr/0218                   | 42 ++++++++++++++++++----------
 test/stderr/0275                   |  1 +
 test/stderr/0278                   |  1 +
 test/stderr/0283                   |  2 ++
 test/stderr/0315                   |  6 ++--
 test/stderr/0332                   |  8 ++++--
 test/stderr/0333                   |  4 ++-
 test/stderr/0357                   |  9 ++++--
 test/stderr/0358                   |  4 ++-
 test/stderr/0360                   |  3 +-
 test/stderr/0361                   |  1 +
 test/stderr/0370                   |  1 +
 test/stderr/0374                   | 17 ++++++++++--
 test/stderr/0375                   | 31 ++++++++++++++++++---
 test/stderr/0377                   |  7 +++--
 test/stderr/0378                   |  7 +++--
 test/stderr/0379                   |  4 ++-
 test/stderr/0380                   |  1 +
 test/stderr/0386                   |  2 ++
 test/stderr/0388                   |  2 ++
 test/stderr/0393                   | 11 +++++---
 test/stderr/0402                   | 10 +++----
 test/stderr/0403                   |  2 ++
 test/stderr/0404                   |  2 ++
 test/stderr/0408                   |  1 +
 test/stderr/0426                   |  5 ++--
 test/stderr/0437                   |  6 ++--
 test/stderr/0450                   |  4 ++-
 test/stderr/0476                   | 11 +++++---
 test/stderr/0487                   |  1 +
 test/stderr/0512                   | 14 ++++++----
 test/stderr/0514                   |  2 ++
 test/stderr/0529                   |  3 +-
 test/stderr/0543                   |  5 ++--
 test/stderr/0544                   |  5 ++--
 test/stderr/0554                   |  4 ++-
 test/stderr/0623                   | 11 +++++---
 test/stderr/0909                   | 21 ++++++++------
 test/stderr/1157                   | 56 +++++++++++++++++++++++++-------------
 test/stderr/2035                   |  3 +-
 test/stderr/2135                   |  3 +-
 test/stderr/2600                   |  1 +
 test/stderr/2610                   |  1 +
 test/stderr/2620                   |  1 +
 test/stderr/4052                   |  1 +
 test/stderr/4510                   |  1 +
 test/stderr/4530                   |  1 +
 test/stderr/5000                   |  1 +
 test/stderr/5004                   |  1 +
 test/stderr/5005                   |  4 +++
 test/stderr/5006                   |  1 +
 test/stderr/5008                   |  6 ++--
 test/stderr/5410                   |  6 ----
 test/stderr/5420                   |  6 ----
 70 files changed, 289 insertions(+), 150 deletions(-)

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 2ef632065..16137f9f6 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -2157,7 +2157,7 @@ if (f.background_daemon)
     pid_t pid = exim_fork(US"daemon");
     if (pid < 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE,
       "fork() failed when starting daemon: %s", strerror(errno));
-    if (pid > 0) exit(EXIT_SUCCESS);      /* in parent process, just exit */
+    if (pid > 0) exim_exit(EXIT_SUCCESS); /* in parent process, just exit */
     (void)setsid();                       /* release controlling terminal */
     f.daemon_listen = daemon_listen;
     }
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 767a75fdc..eadc96d22 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -2462,8 +2462,7 @@ if ((pid = exim_fork(US"delivery-local")) == 0)
   and close the pipe we were writing down before exiting. */
 
   (void)close(pfd[pipe_write]);
-  search_tidyup();
-  exit(EXIT_SUCCESS);
+  exim_exit(EXIT_SUCCESS);
   }
 
 /* Back in the main process: panic if the fork did not succeed. This seems
@@ -5026,7 +5025,7 @@ all pipes, so I do not see a reason to use non-blocking IO here
     big_buffer[0] = continue_transport ? '1' : '0';
     rmt_dlv_checked_write(fd, 'Z', '0', big_buffer, 1);
     (void)close(fd);
-    exit(EXIT_SUCCESS);
+    exim_exit(EXIT_SUCCESS);
     }
 
   /* Back in the mainline: close the unwanted half of the pipe. */
diff --git a/src/src/exim.c b/src/src/exim.c
index d9039ad0c..8111a4489 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -237,7 +237,7 @@ va_end(ap);
 static void
 term_handler(int sig)
 {
-exit(1);
+exim_exit(EXIT_FAILURE);
 }
 
 
@@ -4692,12 +4692,12 @@ if (malware_test_file)
   if ((result = malware_in_file(malware_test_file)) == FAIL)
     {
     printf("No malware found.\n");
-    exit(EXIT_SUCCESS);
+    exim_exit(EXIT_SUCCESS);
     }
   if (result != OK)
     {
     printf("Malware lookup returned non-okay/fail: %d\n", result);
-    exit(EXIT_FAILURE);
+    exim_exit(EXIT_FAILURE);
     }
   if (malware_name)
     printf("Malware found: %s\n", malware_name);
@@ -4706,7 +4706,7 @@ if (malware_test_file)
 #else
   printf("Malware scanning not enabled at compile time.\n");
 #endif
-  exit(EXIT_FAILURE);
+  exim_exit(EXIT_FAILURE);
   }
 
 /* Handle a request to list the delivery queue */
@@ -4715,7 +4715,7 @@ if (list_queue)
   {
   set_process_info("listing the queue");
   queue_list(list_queue_option, argv + recipients_arg, argc - recipients_arg);
-  exit(EXIT_SUCCESS);
+  exim_exit(EXIT_SUCCESS);
   }
 
 /* Handle a request to count the delivery queue */
@@ -4724,7 +4724,7 @@ if (count_queue)
   {
   set_process_info("counting the queue");
   fprintf(stdout, "%u\n", queue_count());
-  exit(EXIT_SUCCESS);
+  exim_exit(EXIT_SUCCESS);
   }
 
 /* Handle actions on specific messages, except for the force delivery and
@@ -4763,7 +4763,7 @@ if (msg_action_arg > 0 && msg_action != MSG_DELIVER && msg_action != MSG_LOAD)
 
   else if (!queue_action(argv[msg_action_arg], msg_action, argv, argc,
     recipients_arg)) yield = EXIT_FAILURE;
-  exit(yield);
+  exim_exit(yield);
   }
 
 /* We used to set up here to skip reading the ACL section, on
@@ -5166,7 +5166,7 @@ if (f.daemon_listen || f.inetd_wait_mode || is_multiple_qrun())
     (void)gettimeofday(&t0, NULL);
 # endif
     if (!tls_dropprivs_validate_require_cipher(FALSE))
-      exit(1);
+      exim_exit(EXIT_FAILURE);
 # ifdef MEASURE_TIMING
     report_time_since(&t0, US"validate_ciphers (delta)");
 # endif
diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index d07c3e024..05387aa3f 100644
--- a/src/src/exim_dbmbuild.c
+++ b/src/src/exim_dbmbuild.c
@@ -199,7 +199,7 @@ while (argc > 1)
 if (argc != 3)
   {
   printf("usage: exim_dbmbuild [-nolc] <source file> <dbm base name>\n");
-  exit(1);
+  exit(EXIT_FAILURE);
   }
 
 if (Ustrcmp(argv[arg], "-") == 0)
@@ -207,7 +207,7 @@ if (Ustrcmp(argv[arg], "-") == 0)
 else if (!(f = fopen(argv[arg], "rb")))
   {
   printf("exim_dbmbuild: unable to open %s: %s\n", argv[arg], strerror(errno));
-  exit(1);
+  exit(EXIT_FAILURE);
   }
 
 /* By default Berkeley db does not put extensions on... which
@@ -217,7 +217,7 @@ can be painful! */
 if (Ustrcmp(argv[arg], argv[arg+1]) == 0)
   {
   printf("exim_dbmbuild: input and output filenames are the same\n");
-  exit(1);
+  exit(EXIT_FAILURE);
   }
 #endif
 
@@ -227,7 +227,7 @@ if (Ustrcmp(argv[arg], argv[arg+1]) == 0)
 if (strlen(argv[arg+1]) > sizeof(temp_dbmname) - 20)
   {
   printf("exim_dbmbuild: output filename is ridiculously long\n");
-  exit(1);
+  exit(EXIT_FAILURE);
   }
 
 Ustrcpy(temp_dbmname, US argv[arg+1]);
@@ -247,7 +247,7 @@ if (!(d = exim_dbopen(temp_dbmname, dirname, O_RDWR|O_CREAT|O_EXCL, 0644)))
   printf("exim_dbmbuild: unable to create %s: %s\n", temp_dbmname,
     strerror(errno));
   (void)fclose(f);
-  exit(1);
+  exit(EXIT_FAILURE);
   }
 
 /* Unless using native db calls, see if we have created <name>.db; if not,
diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index e7d523e88..397b1162e 100644
--- a/src/src/exim_dbutil.c
+++ b/src/src/exim_dbutil.c
@@ -569,7 +569,7 @@ argc -= optind; argv += optind;
 spool_directory = argv[0];
 
 if (!(dbm = dbfn_open(argv[1], O_RDONLY, &dbblock, FALSE, TRUE)))
-  exit(1);
+  exit(EXIT_FAILURE);
 
 /* Scan the file, formatting the information for each entry. Note
 that data is returned in a malloc'ed block, in order that it be
@@ -1210,7 +1210,7 @@ printf("Tidying Exim hints database %s/db/%s\n", argv[1], argv[2]);
 
 spool_directory = argv[1];
 if (!(dbm = dbfn_open(argv[2], O_RDWR, &dbblock, FALSE, TRUE)))
-  exit(1);
+  exit(EXIT_FAILURE);
 
 /* Prepare for building file names */
 
diff --git a/src/src/exim_lock.c b/src/src/exim_lock.c
index 363c1bc71..b37f962d2 100644
--- a/src/src/exim_lock.c
+++ b/src/src/exim_lock.c
@@ -103,7 +103,7 @@ usage(void)
 printf("usage: exim_lock [-v] [-q] [-lockfile] [-fcntl] [-flock] [-mbx]\n"
        "       [-retries <n>] [-interval <n>] [-timeout <n>] [-restore-times]\n"
        "       <file name> [command]\n");
-exit(1);
+exit(EXIT_FAILURE);
 }
 
 
@@ -227,7 +227,7 @@ if (use_flock)
   {
   printf("exim_lock: can't use flock() because it was not available in the\n"
          "           operating system when exim_lock was compiled\n");
-  exit(1);
+  exit(EXIT_FAILURE);
   }
 #endif
 
@@ -271,14 +271,14 @@ if (*filename == '~')
   if (pw == NULL)
     {
     printf("exim_lock: unable to expand file name %s\n", argv[i-1]);
-    exit(1);
+    exit(EXIT_FAILURE);
     }
 
   if ((int)strlen(pw->pw_dir) + (int)strlen(filename) + 1 > sizeof(buffer))
     {
     printf("exim_lock: expanded file name %s%s is too long", pw->pw_dir,
       filename);
-    exit(1);
+    exit(EXIT_FAILURE);
     }
 
   strcpy(buffer, pw->pw_dir);
@@ -294,7 +294,7 @@ if (use_lockfile)
   if (uname(&s) < 0)
     {
     printf("exim_lock: failed to find host name using uname()\n");
-    exit(1);
+    exit(EXIT_FAILURE);
     }
   primary_hostname = s.nodename;
 
@@ -331,7 +331,7 @@ for (j = 0; j < lock_retries; j++)
       {
       printf("exim_lock: failed to create hitching post %s: %s\n", hitchname,
         strerror(errno));
-      exit(1);
+      exit(EXIT_FAILURE);
       }
 
     /* Apply hitching post algorithm. */
diff --git a/src/src/log.c b/src/src/log.c
index e696b2cc7..f12721cf5 100644
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -1464,7 +1464,7 @@ if (Ustrcmp(which, "debug") == 0)
     return;
     }
   fprintf(stderr, "exim: %s\n", errmsg);
-  exit(EXIT_FAILURE);
+  exim_exit(EXIT_FAILURE);
   }
 else log_write(0, LOG_CONFIG|LOG_PANIC_DIE, "%s", errmsg);
 }
diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
index e72d4b53e..b4754c1a1 100644
--- a/src/src/pdkim/signing.c
+++ b/src/src/pdkim/signing.c
@@ -308,7 +308,7 @@ makes sure that important subsystems are initialized. */
 if (!gcry_check_version (GCRYPT_VERSION))
   {
   fputs ("libgcrypt version mismatch\n", stderr);
-  exit (2);
+  exim_exit(2);
   }
 
 /* We don't want to see any warnings, e.g. because we have not yet
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 4ed042df9..940c5d4d3 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3271,7 +3271,7 @@ if (config_file)
     if (os_getcwd(buf, PATH_MAX) == NULL)
       {
       perror("exim: getcwd");
-      exit(EXIT_FAILURE);
+      exim_exit(EXIT_FAILURE);
       }
     g = string_cat(NULL, buf);
 
@@ -3301,7 +3301,7 @@ to a safe place. Later we change to $spool_directory. */
 if (Uchdir("/") < 0)
   {
   perror("exim: chdir `/': ");
-  exit(EXIT_FAILURE);
+  exim_exit(EXIT_FAILURE);
   }
 
 /* Check the status of the file we have opened, if we have retained root
diff --git a/src/src/route.c b/src/src/route.c
index 887ef9975..f42afd2ef 100644
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -1869,7 +1869,7 @@ for (r = addr->start_router ? addr->start_router : routers; r; r = nextr)
 
   if (yield == PASS)
     {
-    if (r->pass_router != NULL) nextr = r->pass_router;
+    if (r->pass_router) nextr = r->pass_router;
     }
   else
     {
@@ -2016,7 +2016,6 @@ if (r->translate_ip_address)
 /* See if this is an unseen routing; first expand the option if necessary.
 DEFER can be given if the expansion fails */
 
-GET_OPTION("unseen");
 yield = exp_bool(addr, US"router", r->name, D_route,
                US"unseen", r->unseen, r->expand_unseen, &unseen);
 if (yield != OK) goto ROUTE_EXIT;
diff --git a/src/src/routers/accept.c b/src/src/routers/accept.c
index 6eb66e377..c747a8ba3 100644
--- a/src/src/routers/accept.c
+++ b/src/src/routers/accept.c
@@ -115,8 +115,8 @@ DEBUG(D_route) debug_printf("%s router called for %s\n  domain = %s\n",
 
 /* Set up the errors address, if any. */
 
-rc = rf_get_errors_address(addr, rblock, verify, &errors_to);
-if (rc != OK) return rc;
+if ((rc = rf_get_errors_address(addr, rblock, verify, &errors_to)) != OK)
+  return rc;
 
 /* Set up the additional and removable headers for the address. */
 
@@ -135,9 +135,12 @@ addr->prop.errors_address = errors_to;
 addr->prop.extra_headers = extra_headers;
 addr->prop.remove_headers = remove_headers;
 
-return rf_queue_add(addr, addr_local, addr_remote, rblock, pw)? OK : DEFER;
+return rf_queue_add(addr, addr_local, addr_remote, rblock, pw) ? OK : DEFER;
 }
 
 #endif    /*!MACRO_PREDEF*/
 #endif    /*ROUTER_ACCEPT*/
+
 /* End of routers/accept.c */
+/* vi: aw ai sw=2
+*/
diff --git a/src/src/routers/rf_get_transport.c b/src/src/routers/rf_get_transport.c
index fa1c2732f..e6acca1b8 100644
--- a/src/src/routers/rf_get_transport.c
+++ b/src/src/routers/rf_get_transport.c
@@ -58,7 +58,7 @@ if (!tpname)
   }
 
 expandable = Ustrchr(tpname, '$') != NULL;
-if (*tpptr != NULL && !expandable) return TRUE;
+if (*tpptr && !expandable) return TRUE;
 
 if (expandable)
   {
diff --git a/test/stderr/0021 b/test/stderr/0021
index 2f1b9a215..e838cb372 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -292,6 +292,7 @@ dropping to exim gid; retaining priv uid
 x in local_parts?
  list element: !bad
 x in local_parts? yes (end of list)
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => x <x@y> R=accept T=appendfile
 LOG: MAIN
diff --git a/test/stderr/0037 b/test/stderr/0037
index a3035c5c7..584120ca5 100644
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -109,6 +109,7 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
+>>>>>>>>>>>>>>>> Exim pid=p1241 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => userx <filter-userx@???> R=user_accept2 T=appendfile
 LOG: MAIN
diff --git a/test/stderr/0143 b/test/stderr/0143
index a28515dd0..0a73ce275 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -62,6 +62,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP(close)>>
 cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'
 Leaving my_smtp transport
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => userx@??? R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
diff --git a/test/stderr/0169 b/test/stderr/0169
index 668501930..5d4eb6dc1 100644
--- a/test/stderr/0169
+++ b/test/stderr/0169
@@ -33,6 +33,7 @@ writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 quota = 52428800 threshold = 21495808 old size = sssss message size = sss
 appendfile yields 0 with errno=dd more_errno=dd
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 appendfile transport returned OK for userx@???
 added retry item for T:userx@???: errno=dd more_errno=dd flags=1
 LOG: MAIN
diff --git a/test/stderr/0218 b/test/stderr/0218
index a895fc601..f725b6d3a 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -13,13 +13,15 @@ test.ex in ""? no (end of list)
 CALLER@??? in senders? no (end of list)
 R: client  (ACL)
 T: send_to_server  (ACL)
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 delivering 10HmaY-000000005vi-0000 (queue run pid p1234)
 test.ex in ""? no (end of list)
 CALLER@??? in senders? no (end of list)
 R: client  (ACL)
 T: send_to_server  (ACL)
->>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 queue running combined directories
 looking in TESTSUITE/spool//input
 delivering 10HmaX-000000005vi-0000 (queue run pid p1234)
@@ -44,11 +46,12 @@ connected
   SMTP<< 250 OK
   SMTP(close)>>
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:351:.:250'
+>>>>>>>>>>>>>>>> Exim pid=p1241 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => a@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 Hints DB:
 configuration file is TESTSUITE/test-config
@@ -74,11 +77,12 @@ T: send_to_server  (ACL)
   SMTP<< 250 OK
   SMTP(close)>>
 cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT+:250:250'
+>>>>>>>>>>>>>>>> Exim pid=p1244 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => b@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1240 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1243 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234 -qq

>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -97,13 +101,15 @@ test.ex in ""? no (end of list)
CALLER@??? in senders? no (end of list)
R: client (ACL)
T: send_to_server (ACL)
->>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1245 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1246 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbA-000000005vi-0000 (queue run pid p1235)
test.ex in ""? no (end of list)
CALLER@??? in senders? no (end of list)
R: client (ACL)
T: send_to_server (ACL)
->>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1247 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1248 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
queue running combined directories
looking in TESTSUITE/spool//input
delivering 10HmaZ-000000005vi-0000 (queue run pid p1235)
@@ -128,6 +134,7 @@ connected
SMTP<< 250 OK
SMTP(close)>>
cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:550:503:503:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1249 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
** a@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@???>: 550 NO
Exim version x.yz ....
@@ -137,10 +144,10 @@ trusted user
admin user
LOG: MAIN
<= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=p1243 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1250 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1251 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbA-000000005vi-0000 (queue run pid p1235)
test.ex in ""? no (end of list)
CALLER@??? in senders? no (end of list)
@@ -150,9 +157,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
+>>>>>>>>>>>>>>>> Exim pid=p1252 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
== b@??? R=client T=send_to_server defer (dd): Connection refused
->>>>>>>>>>>>>>>> Exim pid=p1245 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1253 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1235 -qq
>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -168,7 +176,8 @@ test.ex in ""? no (end of list)
CALLER@??? in senders? no (end of list)
R: client (ACL)
T: send_to_server (ACL)
->>>>>>>>>>>>>>>> Exim pid=p1246 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1254 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1255 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbB-000000005vi-0000 (queue run pid p1236)
R: bounce (ACL)
LOG: MAIN
@@ -177,13 +186,14 @@ LOG: MAIN
CALLER@???: error ignored
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1247 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1256 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbC-000000005vi-0000 (queue run pid p1236)
test.ex in ""? no (end of list)
CALLER@??? in senders? no (end of list)
R: client (ACL)
T: send_to_server (ACL)
->>>>>>>>>>>>>>>> Exim pid=p1248 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1257 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1258 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbA-000000005vi-0000 (queue run pid p1236)
test.ex in ""? no (end of list)
CALLER@??? in senders? no (end of list)
@@ -205,6 +215,7 @@ connected
SMTP<< 250 OK
SMTP(close)>>
cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:503:RSET:250'
+>>>>>>>>>>>>>>>> Exim pid=p1259 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
** b@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 550 Unknown
Exim version x.yz ....
@@ -214,10 +225,10 @@ trusted user
admin user
LOG: MAIN
<= <> R=10HmbA-000000005vi-0000 U=EXIMUSER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=p1249 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1260 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1250 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1261 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -243,11 +254,12 @@ T: send_to_server (ACL)
SMTP<< 250 OK
SMTP(close)>>
cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT+:250:250'
+>>>>>>>>>>>>>>>> Exim pid=p1263 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> c@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1251 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1262 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1236 -qqf
>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0275 b/test/stderr/0275
index b51958a0a..7016b5974 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -475,6 +475,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling userx@???
 t1 transport returned OK for userx@???
 post-process userx@??? (0)
diff --git a/test/stderr/0278 b/test/stderr/0278
index 5e2fb38d9..1910c262e 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -275,6 +275,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling CALLER@???
 t1 transport returned OK for CALLER@???
 post-process CALLER@??? (0)
diff --git a/test/stderr/0283 b/test/stderr/0283
index aedfab70f..e4799ceb5 100644
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -34,6 +34,7 @@ somebody in local_parts? no (end of list)
 changed uid/gid: local delivery to somebody <somebody@???> transport=t1
   uid=EXIM_UID gid=EXIM_GID pid=p1236
 transport error EPIPE ignored
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** somebody@??? R=rest T=t1: return message generated
 changed uid/gid: post-delivery tidying
@@ -72,6 +73,7 @@ getpwnam() succeeded uid=uuuu gid=gggg
 CALLER in local_parts? no (end of list)
 changed uid/gid: local delivery to CALLER <CALLER@???> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=p1239
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => CALLER <CALLER@???> R=caller T=t2
 changed uid/gid: post-delivery tidying
diff --git a/test/stderr/0315 b/test/stderr/0315
index 6ecc61f43..7495a8145 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -50,6 +50,7 @@ After routing:
     y@???
   Failed addresses:
   Deferred addresses:
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   *> x@??? R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
@@ -131,11 +132,12 @@ After routing:
     y@???
   Failed addresses:
   Deferred addresses:
+>>>>>>>>>>>>>>>> Exim pid=p1239 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   *> x@??? R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   *> y@??? R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0332 b/test/stderr/0332
index b717038d9..70dc4bddb 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -33,11 +33,12 @@ After routing:
   Failed addresses:
   Deferred addresses:
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 Hints DB:
 configuration file is TESTSUITE/test-config
@@ -78,9 +79,10 @@ After routing:
   Deferred addresses:
     delay@???
 cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1238 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
->>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: delay@???
 unique = delay@???
@@ -93,7 +95,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@???
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234

>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0333 b/test/stderr/0333
index 11c3a10b0..8a7d6dd42 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -31,6 +31,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
@@ -76,6 +77,7 @@ After routing:
   Deferred addresses:
     delay@???
 cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
->>>>>>>>>>>>>>>> Exim pid=p1235 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0357 b/test/stderr/0357
index 4827e3cc1..cde038b41 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -27,6 +27,7 @@ checking retry status of 127.0.0.1
 no retry data available
 added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1239 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   added retry item
 LOG: MAIN
@@ -70,6 +71,7 @@ no host retry record
 no message retry record
 added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1240 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   existing delete item dropped
   added retry item
@@ -96,7 +98,7 @@ Writing retry data for R:userx@???:<CALLER@???>
   first failed=dddd last try=dddd next try=+2 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
 end of retry processing
->>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234

>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -126,6 +128,7 @@ no host retry record
no message retry record
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1242 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
reading retry information for R:userx@???:<CALLER@???> from subprocess
existing delete item dropped
added retry item
@@ -152,7 +155,7 @@ Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+4 expired=0
errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
->>>>>>>>>>>>>>>> Exim pid=p1240 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1243 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1235
>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -185,7 +188,7 @@ Failed addresses:
Deferred addresses:
userx@???: no retry items
end of retry processing
->>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1236
>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0358 b/test/stderr/0358
index 5ecfe8dcd..f7cfee1f8 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -33,6 +33,7 @@ no retry data available
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
added retry item for R:usery@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
reading retry information for R:userx@???:<CALLER@???> from subprocess
added retry item
reading retry information for R:usery@???:<CALLER@???> from subprocess
@@ -95,6 +96,7 @@ no message retry record
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
added retry item for R:usery@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1238 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
reading retry information for R:userx@???:<CALLER@???> from subprocess
existing delete item dropped
added retry item
@@ -142,7 +144,7 @@ Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+4 expired=0
errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0360 b/test/stderr/0360
index cff19addd..724a67d02 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -146,6 +146,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@???
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   *> unknown@??? <cms@???> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option"

>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -244,7 +245,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@???
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234 -qf

>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0361 b/test/stderr/0361
index bd6d0a477..f84c58517 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -250,6 +250,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   locking by lockfile fcntl 
 *** delivery by t2 transport bypassed by -N option
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling kilos@???/t2
 t2 transport returned OK for kilos@???
 post-process kilos@??? (0)
diff --git a/test/stderr/0370 b/test/stderr/0370
index 765c4d9a4..5b619f8f6 100644
--- a/test/stderr/0370
+++ b/test/stderr/0370
@@ -29,6 +29,7 @@ writing data block fd=dddd size=sss timeout=3600
 writing error EEE: Broken pipe
 transport error EPIPE ignored
 t1 transport yielded 0
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 t1 transport returned OK for |TESTSUITE/bin/iefbr14
 LOG: MAIN
   => |TESTSUITE/bin/iefbr14 <userx@???> R=r1 T=t1
diff --git a/test/stderr/0374 b/test/stderr/0374
index 82baa09e7..3c8f9d6d8 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -354,33 +354,45 @@ After routing:
     d3@???
   Failed addresses:
   Deferred addresses:
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => a1 <a1@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => b1 <b1@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => c1 <c1@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d1 <d1@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1241 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d2 <d2@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1242 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d3 <d3@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1243 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => a1 <a1@???> R=u1 T=ut1
 transport error EPIPE ignored
+>>>>>>>>>>>>>>>> Exim pid=p1244 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** b1@??? R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 transport error EPIPE ignored
+>>>>>>>>>>>>>>>> Exim pid=p1245 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   == c1@??? R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1246 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d1@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1247 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   == d2@??? R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@???>: 450 soft error
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1248 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** d3@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
 Exim version x.yz ....
@@ -442,11 +454,12 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
+>>>>>>>>>>>>>>>> Exim pid=p1251 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => CALLER <CALLER@???> R=real T=real
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1250 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1249 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>

>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0375 b/test/stderr/0375
index 5a909eff3..e6a7b9402 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -832,62 +832,82 @@ After routing:
   Failed addresses:
   Deferred addresses:
     g1@???
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => a1 <a1@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => b1 <b1@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => c1 <c1@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d1 <d1@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1241 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d2 <d2@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1242 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d3 <d3@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1243 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => e1 <e1@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1244 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => f1 <f1@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1245 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => f2 <f2@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1246 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => f3 <f3@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1247 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => a1 <a1@???> P=<> R=u1 T=ut1
 log writing disabled
 transport error EPIPE ignored
+>>>>>>>>>>>>>>>> Exim pid=p1248 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** b1@??? P=<> R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 log writing disabled
 transport error EPIPE ignored
+>>>>>>>>>>>>>>>> Exim pid=p1249 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   == c1@??? R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 log writing disabled
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1250 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => d1@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1251 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   == d2@??? R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@???>: 450 soft error
 log writing disabled
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1252 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** d3@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
 log writing disabled
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1253 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** e1@??? P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@???>: 550 hard error
 log writing disabled
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1254 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => f1@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1255 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   == f2@??? R=ut6 T=ut6 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f2@???>: 450 soft error
 log writing disabled
 cmdlog: '220'
+>>>>>>>>>>>>>>>> Exim pid=p1256 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** f3@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@???>: 550 hard error
 log writing disabled
@@ -973,12 +993,13 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
+>>>>>>>>>>>>>>>> Exim pid=p1259 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => CALLER <CALLER@???> P=<> R=real T=real
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1258 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1257 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   d3@??? <d3@???>: error ignored
 log writing disabled
@@ -1083,12 +1104,14 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
+>>>>>>>>>>>>>>>> Exim pid=p1262 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => h1 <h1@???> P=<CALLER@???> R=real T=real
+>>>>>>>>>>>>>>>> Exim pid=p1263 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => h1 <h1@???> P=<CALLER@???> R=ut8 T=ut1
 log writing disabled
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1261 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1260 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0377 b/test/stderr/0377
index 4cdc7f417..f212cdb2e 100644
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -315,10 +315,13 @@ After routing:
     defer_aaaa@???
     defer_bbbb@???
     defer_cccc@???
+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => aaaa <aaaa@???> R=seen_aaaa T=t1
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => bbbb <bbbb@???> R=bbbb_0 T=t1
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => cccc <cccc@???> R=cccc_accept T=t1

>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -580,7 +583,7 @@ After routing:
cccc@??? was previously delivered (t1 transport): discarded
aaaa@??? was previously delivered (t1 transport): discarded
bbbb@??? was previously delivered (t1 transport): discarded
->>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234 -qf
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -841,7 +844,7 @@ After routing:
cccc@??? was previously delivered (t1 transport): discarded
aaaa@??? was previously delivered (t1 transport): discarded
bbbb@??? was previously delivered (t1 transport): discarded
->>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1235 -qf
>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0378 b/test/stderr/0378
index e18685a37..b3ab37ec9 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -160,11 +160,14 @@ LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1238 (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> >CALLER@??? <aaaa@???> R=aaaa T=t3
transport error EPIPE ignored
+>>>>>>>>>>>>>>>> Exim pid=p1241 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> |/bin/sh -c exit <aaaa@???> R=aaaa T=t2
+>>>>>>>>>>>>>>>> Exim pid=p1242 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> TESTSUITE/test-mail/file <aaaa@???> R=aaaa T=t1
>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -242,7 +245,7 @@ text "This is an autoreply"' (tainted)
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
->>>>>>>>>>>>>>>> Exim pid=p1240 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1243 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
 rda_interpret: subprocess yield=0 error=NULL
 set transport t3
 aaaa router generated >CALLER@???
@@ -309,7 +312,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer_aaaa@???
->>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234 -qf

>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0379 b/test/stderr/0379
index b67f47861..2440d10ad 100644
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -130,8 +130,10 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@???
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => bbbb <aaaa@???> R=bc T=t1
+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => cccc <aaaa@???> R=bc T=t1

>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -169,7 +171,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@???
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234 -qf

>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0380 b/test/stderr/0380
index 3c0139d57..38bbcd1be 100644
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -80,6 +80,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     aaaa@???
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => bbbb <bbbb@???> R=r3 T=t1

>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0386 b/test/stderr/0386
index 800b8b2ce..bb322c8a4 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -375,6 +375,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling 2@b
t1 transport returned OK for 2@b
post-process 2@b (0)
@@ -569,6 +570,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling 2@b
t1 transport returned OK for 2@b
post-process 2@b (0)
diff --git a/test/stderr/0388 b/test/stderr/0388
index 1a6c4bf24..78be65faf 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -133,6 +133,8 @@ added retry item for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S: errno=dd more_errno=dd,
set_process_info: pppp delivering 10HmaX-000000005vi-0000: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaX-000000005vi-0000 (just run smtp for x@y in subprocess)
search_tidyup called
+search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
reading retry information for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S from subprocess
added retry item
reading retry information for R:x@y from subprocess
diff --git a/test/stderr/0393 b/test/stderr/0393
index dfd8a44da..9efcb548c 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -43,6 +43,7 @@ writing data block fd=dddd size=sss timeout=0
end of filtering transport writing: yield=1
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
@@ -84,13 +85,14 @@ cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -127,10 +129,11 @@ cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
+>>>>>>>>>>>>>>>> Exim pid=p1243 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1242 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0402 b/test/stderr/0402
index 1f55d3e22..e92ec9019 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -544,7 +544,6 @@ r5 router generated TESTSUITE/test-mail/junk
errors_to=NULL transport=ft1
uid=unset gid=unset home=/non-exist/$local_part
try option unseen
-try option unseen
routed by r5 router
envelope to: rd+usery@???
transport: <none>
@@ -603,7 +602,6 @@ r4 router generated TESTSUITE/test-mail/junk
errors_to=NULL transport=ft1
uid=unset gid=unset home=/non-exist/CALLER
try option unseen
-try option unseen
routed by r4 router
envelope to: rd+CALLER@???
transport: <none>
@@ -649,7 +647,6 @@ domain = test.ex
errors_to=NULL
domain_data=NULL local_part_data=userz
try option unseen
-try option unseen
routed by r3 router
envelope to: userz@???
transport: t2
@@ -688,7 +685,6 @@ domain = test.ex
errors_to=NULL
domain_data=NULL local_part_data=usery
try option unseen
-try option unseen
routed by r2 router
envelope to: usery@???
transport: t1
@@ -720,7 +716,6 @@ domain = test.ex
errors_to=NULL
domain_data=NULL local_part_data=CALLER
try option unseen
-try option unseen
routed by r1 router
envelope to: CALLER@???
transport: t1
@@ -840,6 +835,7 @@ try option message_suffix
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling TESTSUITE/test-mail/junk:rd+usery@???
ft1 transport returned OK for TESTSUITE/test-mail/junk
post-process TESTSUITE/test-mail/junk (0)
@@ -930,6 +926,7 @@ try option message_suffix
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling TESTSUITE/test-mail/junk:rd+CALLER@???
ft1 transport returned OK for TESTSUITE/test-mail/junk
post-process TESTSUITE/test-mail/junk (0)
@@ -964,6 +961,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
maildir_use_size_file=no
locking by lockfile fcntl
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling CALLER@???
t1 transport returned OK for CALLER@???
post-process CALLER@??? (0)
@@ -1005,6 +1003,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
maildir_use_size_file=no
locking by lockfile fcntl
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling usery@???
t1 transport returned OK for usery@???
post-process usery@??? (0)
@@ -1046,6 +1045,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
maildir_use_size_file=no
locking by lockfile fcntl
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling userz@???
t2 transport returned OK for userz@???
post-process userz@??? (0)
diff --git a/test/stderr/0403 b/test/stderr/0403
index f35b593fd..39b958d45 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -200,6 +200,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
locking by lockfile fcntl
*** delivery by t1 transport bypassed by -N option
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling TESTSUITE/test-mail/junk:userx@???
t1 transport returned OK for TESTSUITE/test-mail/junk
post-process TESTSUITE/test-mail/junk (0)
@@ -415,6 +416,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
locking by lockfile fcntl
*** delivery by t1 transport bypassed by -N option
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling TESTSUITE/test-mail/junk:charlie@???
t1 transport returned OK for TESTSUITE/test-mail/junk
post-process TESTSUITE/test-mail/junk (0)
diff --git a/test/stderr/0404 b/test/stderr/0404
index c910f9301..699106f7b 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -18612,6 +18612,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling sender@???
t2 transport returned OK for sender@???
post-process sender@??? (0)
@@ -18646,6 +18647,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=p1238 (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport succeeded
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...:userx@???
t1 transport returned OK for >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
post-process >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... (0)
diff --git a/test/stderr/0408 b/test/stderr/0408
index 6c5a96815..09ad23207 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -167,6 +167,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/0426 b/test/stderr/0426
index 941043411..b9ab6329f 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -54,6 +54,7 @@ After routing:
Failed addresses:
Deferred addresses:
cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
** x@??? R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@???>: 550 Unknown
Exim version x.yz ....
@@ -96,8 +97,8 @@ After routing:
Deferred addresses:
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1236 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0437 b/test/stderr/0437
index debc4f72a..29241cfd3 100644
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -45,12 +45,13 @@ search_tidyup called
creating new cache entry
lookup yielded: file
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1235 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
search_find: file="TESTSUITE/aux-fixed/0437.ls"
@@ -79,12 +80,13 @@ search_tidyup called
creating new cache entry
lookup yielded: file
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234
search_tidyup called
diff --git a/test/stderr/0450 b/test/stderr/0450
index 28dd13c54..095135bbf 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -29,6 +29,7 @@ all IP addresses skipped or deferred at least one address
updating wait-t1 database
added 10HmaX-000000005vi-0000 to queue for 127.0.0.1
Leaving t1 transport
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -60,9 +61,10 @@ all IP addresses skipped or deferred at least one address
updating wait-t1 database
already listed for 127.0.0.1
Leaving t1 transport
+>>>>>>>>>>>>>>>> Exim pid=p1238 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0476 b/test/stderr/0476
index f9ca0dce9..ee229ff93 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -54,6 +54,7 @@ cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:RSET'
set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@???: result OK
Leaving t1 transport
set_process_info: pppp delivering 10HmaX-000000005vi-0000 (just run t1 for userx@??? in subprocess)
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
set_process_info: pppp running queue: waiting for 10HmaX-000000005vi-0000 (pppp)
set_process_info: pppp delivering 10HmaX-000000005vi-0000: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaX-000000005vi-0000
@@ -100,16 +101,17 @@ updating wait-t1 database
added 10HmaZ-000000005vi-0000 to queue for 127.0.0.1
Leaving t1 transport
set_process_info: pppp delivering 10HmaZ-000000005vi-0000 (just run t1 for CALLER@??? in subprocess)
+>>>>>>>>>>>>>>>> Exim pid=p1238 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
set_process_info: pppp delivering 10HmaZ-000000005vi-0000: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaZ-000000005vi-0000
LOG: MAIN
== CALLER@??? R=r1 T=t1 defer (dd): Connection refused
set_process_info: pppp tidying up after delivering 10HmaZ-000000005vi-0000
->>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1235 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
set_process_info: pppp running queue: waiting for children of pppp
set_process_info: pppp running queue
set_process_info: pppp running queue: 10HmaY-000000005vi-0000
@@ -129,13 +131,14 @@ updating wait-t1 database
added 10HmaY-000000005vi-0000 to queue for 127.0.0.1
Leaving t1 transport
set_process_info: pppp delivering 10HmaY-000000005vi-0000 (just run t1 for usery@??? in subprocess)
+>>>>>>>>>>>>>>>> Exim pid=p1240 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
set_process_info: pppp running queue: waiting for 10HmaY-000000005vi-0000 (pppp)
set_process_info: pppp delivering 10HmaY-000000005vi-0000: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaY-000000005vi-0000
LOG: retry_defer MAIN
== usery@??? R=r1 T=t1 defer (-54): retry time not reached for any host for 'test.ex'
set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000
->>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
set_process_info: pppp running queue: waiting for children of pppp
set_process_info: pppp running queue
LOG: queue_run MAIN
diff --git a/test/stderr/0487 b/test/stderr/0487
index 15da5685a..cb058603d 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -171,6 +171,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/0512 b/test/stderr/0512
index e7c7f8f9f..f3979815b 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -67,6 +67,7 @@ all IP addresses skipped or deferred at least one address
updating wait-t1 database
already listed for 127.0.0.1
Leaving t1 transport
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
@@ -90,11 +91,11 @@ LOG: MAIN
=> :blackhole: <CALLER@???> R=r0
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1236 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234 -qf
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -143,6 +144,7 @@ hosts_max_try_hardlimit reached: behave as if all hosts were tried
updating wait-t1 database
already listed for 127.0.0.1
Leaving t1 transport
+>>>>>>>>>>>>>>>> Exim pid=p1240 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
@@ -166,11 +168,11 @@ LOG: MAIN
=> :blackhole: <CALLER@???> R=r0
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1239 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1242 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1243 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1235 -qf
>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0514 b/test/stderr/0514
index d6c49aa20..bb94dd359 100644
--- a/test/stderr/0514
+++ b/test/stderr/0514
@@ -17,3 +17,5 @@ Non-recipients:
recipients_count=1
**** SPOOL_IN - No additional fields
body_linecount=1 message_linecount=0
+search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0529 b/test/stderr/0529
index 587cef7a8..3ef6a56dc 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -27,6 +27,7 @@ After routing:
Failed addresses:
Deferred addresses:
no retry data available
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
added retry item for T:TESTSUITE/test-mail/rmbox:x@???: errno=-22 more_errno=dd flags=0
LOG: MAIN
== TESTSUITE/test-mail/rmbox <x@???> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
@@ -80,7 +81,7 @@ Deferred addresses:
TESTSUITE/test-mail/rmbox: no retry items
x@???: no retry items
end of retry processing
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0543 b/test/stderr/0543
index b09cdb4f1..f43aa63fe 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -32,11 +32,12 @@ After routing:
Failed addresses:
Deferred addresses:
cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 Considering: usery@domain1
 unique = usery@domain1
@@ -49,7 +50,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     usery@domain1
->>>>>>>>>>>>>>>> Exim pid=p1236 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234

>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0544 b/test/stderr/0544
index 9540e834a..1f7e29bd4 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -363,12 +363,10 @@ try option router_home_directory
 try option set
 try option transport
 try option unseen
-try option unseen
 try option router_home_directory
 try option set
 try option transport
 try option unseen
-try option unseen
 try option multi_domain
 try option multi_domain
 try option max_parallel
@@ -379,6 +377,7 @@ try option return_path
  ├───expanded: $domain
  ╰─────result: domain1.ex
             ╰──(tainted)
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   == userx@??? R=smarthost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue
 LOG: MAIN
@@ -537,4 +536,4 @@ sender.domain in "domain=recipient.domain/sender_domain=sender.domain"? no (end
 try option acl_smtp_quit
 LOG: smtp_connection MAIN
   SMTP connection from CALLER D=qqs closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0554 b/test/stderr/0554
index 4289094b1..25bba511d 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -19,6 +19,7 @@ checking retry status of 127.0.0.1
 no retry data available
 added retry item for R:x@y:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 reading retry information for R:x@y:<CALLER@???> from subprocess
   added retry item
 LOG: MAIN
@@ -60,6 +61,7 @@ no message retry record
 added retry item for R:x@y:<CALLER@???>: errno=dd more_errno=dd,A flags=1
 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 reading retry information for R:x@y from subprocess
   existing delete item dropped
   added delete item
@@ -88,4 +90,4 @@ Deferred addresses:
 end of retry processing
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0623 b/test/stderr/0623
index a1d5f070e..3786f7168 100644
--- a/test/stderr/0623
+++ b/test/stderr/0623
@@ -61,6 +61,7 @@ cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+:451:221'
 added retry item for T:[127.0.0.1]:127.0.0.1:PORT_D:10HmaZ-000000005vi-0000: errno=-46 more_errno=dd,A flags=6
 all IP addresses skipped or deferred at least one address
 Leaving send_to_server transport
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   == tempreject@??? R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 451 Service not available

>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -126,14 +127,15 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL
SMTP(close)>>
cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+:550:221'
Leaving send_to_server transport
+>>>>>>>>>>>>>>>> Exim pid=p1239 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
** permreject@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 content rejected
LOG: MAIN
permreject@???: error ignored
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -199,7 +201,8 @@ cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+'
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_D:10HmbB-000000005vi-0000: errno=-18 more_errno=dd,A flags=6
all IP addresses skipped or deferred at least one address
Leaving send_to_server transport
+>>>>>>>>>>>>>>>> Exim pid=p1242 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
== permreject@??? R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to end of data
->>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0909 b/test/stderr/0909
index 9a9b6a901..3ba13b3b0 100644
--- a/test/stderr/0909
+++ b/test/stderr/0909
@@ -60,6 +60,7 @@ ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL
SMTP(close)>>
cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT+:QUIT+:250:250:250:221'
Leaving send_to_server transport
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> good@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L K C="250 OK chunked message data"
LOG: MAIN
@@ -128,14 +129,15 @@ cmd buf flush ddd bytes (more expected)
SMTP(close)>>
cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:BDAT+:250:QUIT+:221'
Leaving send_to_server transport
+>>>>>>>>>>>>>>>> Exim pid=p1239 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> nopipe@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] K C="250 OK chunked message data"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from root D=q.qqqs closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -201,12 +203,13 @@ cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT+:QUIT+:250:250:451:221'
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_D:10HmaZ-000000005vi-0000: errno=-46 more_errno=dd,A flags=6
all IP addresses skipped or deferred at least one address
Leaving send_to_server transport
+>>>>>>>>>>>>>>>> Exim pid=p1242 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
== tempreject@??? R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 451 Service not available
->>>>>>>>>>>>>>>> Exim pid=p1239 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from root D=q.qqqs closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -270,16 +273,17 @@ ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL
SMTP(close)>>
cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT+:QUIT+:250:250:550:221'
Leaving send_to_server transport
+>>>>>>>>>>>>>>>> Exim pid=p1245 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
** permreject@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 550 content rejected
LOG: MAIN
permreject@???: error ignored
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1244 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from root D=q.qqqs closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -347,9 +351,10 @@ cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT+:QUIT+:250:250'
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_D:10HmbB-000000005vi-0000: errno=-18 more_errno=dd,A flags=6
all IP addresses skipped or deferred at least one address
Leaving send_to_server transport
+>>>>>>>>>>>>>>>> Exim pid=p1248 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
== dataloss@??? R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to pipelined end of data
->>>>>>>>>>>>>>>> Exim pid=p1243 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1247 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from root D=q.qqqs closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1246 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/1157 b/test/stderr/1157
index 27b80fa00..913de5074 100644
--- a/test/stderr/1157
+++ b/test/stderr/1157
@@ -5,9 +5,12 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=p1234 -qqf
->>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1242 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1243 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1244 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1245 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1246 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1247 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -42,11 +45,12 @@ cmd buf flush ddd bytes
SMTP>> .
SMTP<< 250 OK id=10HmbA-000000005vi-0000
127.0.0.1 in hosts_noproxy_tls? no (end of list)
+>>>>>>>>>>>>>>>> Exim pid=p1248 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-000000005vi-0000"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1245 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1249 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -64,11 +68,12 @@ cmd buf flush ddd bytes
SMTP<< 250 OK id=10HmbB-000000005vi-0000
SMTP(close)>>
cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250'
+>>>>>>>>>>>>>>>> Exim pid=p1251 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userz@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-000000005vi-0000"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1246 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1250 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -91,12 +96,13 @@ cmd buf flush ddd bytes (more expected)
SMTP<< 221 myhost.test.ex closing connection
SMTP(close)>>
cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT+:250:221'
+>>>>>>>>>>>>>>>> Exim pid=p1253 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-000000005vi-0000"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1247 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1248 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1252 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1254 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1234 -qqf
>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -107,9 +113,12 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=p1235 -qqf
->>>>>>>>>>>>>>>> Exim pid=p1249 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1250 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1251 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1255 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1256 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1257 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1258 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1259 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1260 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -144,11 +153,12 @@ cmd buf flush ddd bytes
SMTP>> .
SMTP<< 250 OK id=10HmbG-000000005vi-0000
127.0.0.1 in hosts_noproxy_tls? no (end of list)
+>>>>>>>>>>>>>>>> Exim pid=p1261 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> usera@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-000000005vi-0000"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1252 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1262 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -166,11 +176,12 @@ cmd buf flush ddd bytes
SMTP<< 250 OK id=10HmbH-000000005vi-0000
SMTP(close)>>
cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250'
+>>>>>>>>>>>>>>>> Exim pid=p1264 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userc@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-000000005vi-0000"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1253 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1263 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
Hints DB:
configuration file is TESTSUITE/test-config
@@ -193,12 +204,13 @@ cmd buf flush ddd bytes (more expected)
SMTP<< 221 myhost.test.ex closing connection
SMTP(close)>>
cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT+:250:221'
+>>>>>>>>>>>>>>>> Exim pid=p1266 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userb@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-000000005vi-0000"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1254 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1255 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1265 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1267 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=p1235 -qqf
>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -209,9 +221,12 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=p1236 -qqf
->>>>>>>>>>>>>>>> Exim pid=p1256 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1257 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1258 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1268 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1269 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1270 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1271 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1272 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1273 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -256,11 +271,12 @@ cmd buf flush ddd bytes
          250 HELP
   SMTP(close)>>
 cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250:EHLO:250-'
+>>>>>>>>>>>>>>>> Exim pid=p1274 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => user_p@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-000000005vi-0000"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1259 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1275 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 Hints DB:
 configuration file is TESTSUITE/test-config
@@ -299,11 +315,12 @@ cmd buf flush ddd bytes
          250 HELP
   SMTP(close)>>
 cmdlog: 'STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250:EHLO:250-'
+>>>>>>>>>>>>>>>> Exim pid=p1277 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => user_r@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-000000005vi-0000"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1260 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1276 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 Hints DB:
 configuration file is TESTSUITE/test-config
@@ -336,11 +353,12 @@ cmd buf flush ddd bytes
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
 cmdlog: 'STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
+>>>>>>>>>>>>>>>> Exim pid=p1279 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => user_q@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-000000005vi-0000"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=p1261 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1278 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1236 -qqf

>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2035 b/test/stderr/2035
index 9192cd128..920205672 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -77,11 +77,12 @@ cmd buf flush ddd bytes (more expected)
SMTP(close)>>
cmdlog: 'DATA:354:.:250:QUIT+:221'
Leaving t1 transport
+>>>>>>>>>>>>>>>> Exim pid=p1238 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userb@??? R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000"
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1238 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>

******** SERVER ********
diff --git a/test/stderr/2135 b/test/stderr/2135
index 9192cd128..920205672 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -77,11 +77,12 @@ cmd buf flush ddd bytes (more expected)
SMTP(close)>>
cmdlog: 'DATA:354:.:250:QUIT+:221'
Leaving t1 transport
+>>>>>>>>>>>>>>>> Exim pid=p1238 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userb@??? R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000"
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1238 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>

******** SERVER ********
diff --git a/test/stderr/2600 b/test/stderr/2600
index 5a88b759c..8bfaf1c92 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -669,6 +669,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/2610 b/test/stderr/2610
index a047a3244..e0326a6a7 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -918,6 +918,7 @@ writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
close MYSQL connection: 127.0.0.1:PORT_N/test/root
+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling ph10@???
t1 transport returned OK for ph10@???
post-process ph10@??? (0)
diff --git a/test/stderr/2620 b/test/stderr/2620
index ad5ac2be7..6446d6912 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -814,6 +814,7 @@ writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
close PGSQL connection: localhost:PORT_N/test/CALLER
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling CALLER@???
t1 transport returned OK for CALLER@???
post-process CALLER@??? (0)
diff --git a/test/stderr/4052 b/test/stderr/4052
index 184891086..f90265149 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -68,6 +68,7 @@ ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL
SMTP(close)>>
cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT+:250:220'
Leaving smtp transport
+>>>>>>>>>>>>>>>> Exim pid=p1243 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> extchange@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
LOG: MAIN
diff --git a/test/stderr/4510 b/test/stderr/4510
index d1a32a322..3b73b82f0 100644
--- a/test/stderr/4510
+++ b/test/stderr/4510
@@ -59,6 +59,7 @@ cmd buf flush ddd bytes (more expected)
SMTP<< 221 myhost.test.ex closing connection
SMTP(close)>>
cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT+:250:221'
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> d@??? R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] DKIM=test.ex:sel_bad C="250 OK id=10HmbN-000000005vi-0000"
LOG: MAIN
diff --git a/test/stderr/4530 b/test/stderr/4530
index 7d7489c05..0484105f5 100644
--- a/test/stderr/4530
+++ b/test/stderr/4530
@@ -71,6 +71,7 @@ cmd buf flush ddd bytes
SMTP<< 221 myhost.test.ex closing connection
SMTP(close)>>
cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> d@??? R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DKIM=test.ex:sel_bad C="250 OK id=10HmbL-000000005vi-0000"
LOG: MAIN
diff --git a/test/stderr/5000 b/test/stderr/5000
index 5b04c5a79..7ff1d8f2d 100644
--- a/test/stderr/5000
+++ b/test/stderr/5000
@@ -45,6 +45,7 @@ mailbox quota exceeded
maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
maildir_taggedX_appendfile transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
LOG: MAIN
diff --git a/test/stderr/5004 b/test/stderr/5004
index 57eed3480..6ab926c43 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -157,6 +157,7 @@ renaming temporary file
renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling TESTSUITE/test-mail:userx@???
t1 transport returned OK for TESTSUITE/test-mail
post-process TESTSUITE/test-mail (0)
diff --git a/test/stderr/5005 b/test/stderr/5005
index afde81d1c..6620345bf 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -155,6 +155,7 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling nofile@???
t1 transport returned OK for nofile@???
post-process nofile@??? (0)
@@ -345,6 +346,7 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
@@ -530,6 +532,7 @@ maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1242 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
post-process userx@??? (1)
@@ -728,6 +731,7 @@ maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1245 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
post-process userx@??? (1)
diff --git a/test/stderr/5006 b/test/stderr/5006
index 131065b25..01e2ee923 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -153,6 +153,7 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/5008 b/test/stderr/5008
index 3afac02c3..3a572fab1 100644
--- a/test/stderr/5008
+++ b/test/stderr/5008
@@ -34,6 +34,7 @@ writing data block fd=dddd size=sss timeout=0
renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
@@ -78,10 +79,11 @@ writing data block fd=dddd size=sss timeout=0
renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5410 b/test/stderr/5410
index 53104d082..9b4f0ff8a 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -96,7 +96,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
end of ACL "cutthrough": ACCEPT
@@ -124,7 +123,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
try option interface
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
try option dscp
@@ -755,7 +753,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
end of ACL "cutthrough": ACCEPT
@@ -783,7 +780,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
try option interface
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
try option dscp
@@ -1364,7 +1360,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
end of ACL "cutthrough": ACCEPT
@@ -1392,7 +1387,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
try option interface
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
try option dscp
diff --git a/test/stderr/5420 b/test/stderr/5420
index f815d3883..caa9e0de0 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -96,7 +96,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
end of ACL "cutthrough": ACCEPT
@@ -124,7 +123,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
try option interface
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
try option dscp
@@ -755,7 +753,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
end of ACL "cutthrough": ACCEPT
@@ -783,7 +780,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
try option interface
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
try option dscp
@@ -1364,7 +1360,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
----------- end verify ------------
accept: condition test succeeded in ACL "cutthrough"
end of ACL "cutthrough": ACCEPT
@@ -1392,7 +1387,6 @@ domain.com in "*"?
domain.com in "*"? yes (matched "*")
try option transport
try option unseen
-try option unseen
try option interface
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
try option dscp

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/