X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/46d2a5e6f6e7709d172903b13945d23fc0a2c888..89318c714454e11217505d2163d807d5d827f50a:/test/stderr/0438?ds=sidebyside

diff --git a/test/stderr/0438 b/test/stderr/0438
index eb5cef8aa..58f8d8262 100644
--- a/test/stderr/0438
+++ b/test/stderr/0438
@@ -2,7 +2,7 @@
 ******** SERVER ********
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -11,24 +11,22 @@ daemon_smtp_port overridden by -oX:
   <: 1225
 creating notifier socket
  TESTSUITE/spool/exim_daemon_notify
-listening on all interfaces (IPv4) port 1225
+listening on all interfaces (IPv4) port PORT_D
 pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 LOG: MAIN
-  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
+  exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
+set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
-daemon forking for daemon-del-pidfile
-pppp postfork: daemon-del-pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-daemon forked for daemon-del-pidfile: npppp
+SIGTERM/SIGINT seen
+p1237 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1235
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -37,24 +35,22 @@ daemon_smtp_port overridden by -oX:
   <: 1225
 creating notifier socket
  TESTSUITE/spool/exim_daemon_notify
-listening on all interfaces (IPv4) port 1225
+listening on all interfaces (IPv4) port PORT_D
 pid written to TESTSUITE/spool/exim-daemon.anotherpid
 changed uid/gid: running as a daemon
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1235
 LOG: MAIN
-  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
+  exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D
+set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
-daemon forking for daemon-del-pidfile
-pppp postfork: daemon-del-pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX
-daemon forked for daemon-del-pidfile: npppp
+SIGTERM/SIGINT seen
+p1238 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1236
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -63,18 +59,16 @@ daemon_smtp_port overridden by -oX:
   <: 1225
 creating notifier socket
  TESTSUITE/spool/exim_daemon_notify
-listening on all interfaces (IPv4) port 1225
+listening on all interfaces (IPv4) port PORT_D
 pid written to TESTSUITE/spool/mypidfile
 changed uid/gid: running as a daemon
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1236
 LOG: MAIN
-  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
+  exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D
+set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port PORT_D
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
-daemon forking for daemon-del-pidfile
-pppp postfork: daemon-del-pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX
-daemon forked for daemon-del-pidfile: npppp
+SIGTERM/SIGINT seen
+p1239 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>