diff options
Diffstat (limited to 'test/stderr')
-rw-r--r-- | test/stderr/0055 | 10 | ||||
-rw-r--r-- | test/stderr/0218 | 26 | ||||
-rw-r--r-- | test/stderr/0433 | 6 | ||||
-rw-r--r-- | test/stderr/0438 | 3 | ||||
-rw-r--r-- | test/stderr/0476 | 4 | ||||
-rw-r--r-- | test/stderr/0609 | 1 | ||||
-rw-r--r-- | test/stderr/0621 | 2 | ||||
-rw-r--r-- | test/stderr/1007 | 8 | ||||
-rw-r--r-- | test/stderr/1150 | 4 | ||||
-rw-r--r-- | test/stderr/1160 | 4 | ||||
-rw-r--r-- | test/stderr/2201 | 1 |
11 files changed, 45 insertions, 24 deletions
diff --git a/test/stderr/0055 b/test/stderr/0055 index 81c1e7f09..71884fec7 100644 --- a/test/stderr/0055 +++ b/test/stderr/0055 @@ -31,7 +31,7 @@ LOG: MAIN == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue LOG: queue_run MAIN Start queue run: pid=pppp -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +delivering 10HmbC-0005vi-00 (queue run pid pppp) LOG: MAIN *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" LOG: MAIN @@ -40,14 +40,14 @@ LOG: queue_run MAIN End queue run: pid=pppp LOG: queue_run MAIN Start queue run: pid=pppp -qq -delivering 10HmbD-0005vi-00 (queue run pid ppppp) -delivering 10HmbE-0005vi-00 (queue run pid ppppp) -delivering 10HmbD-0005vi-00 (queue run pid ppppp) +delivering 10HmbD-0005vi-00 (queue run pid pppp) +delivering 10HmbE-0005vi-00 (queue run pid pppp) +delivering 10HmbD-0005vi-00 (queue run pid pppp) LOG: MAIN *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN Completed -delivering 10HmbE-0005vi-00 (queue run pid ppppp) +delivering 10HmbE-0005vi-00 (queue run pid pppp) LOG: MAIN *> yyy@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option" LOG: MAIN diff --git a/test/stderr/0218 b/test/stderr/0218 index 28db0ea01..9cbe05ff0 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -7,17 +7,17 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -44,7 +44,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) SMTP>> MAIL FROM:<CALLER@test.ex> @@ -74,17 +74,17 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -112,7 +112,7 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused @@ -130,11 +130,11 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbB-0005vi-00 (queue run pid ppppp) +delivering 10HmbB-0005vi-00 (queue run pid pppp) R: bounce (ACL) LOG: MAIN ** CALLER@test.ex F=<> R=bounce: just discard @@ -143,11 +143,11 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +delivering 10HmbC-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected @@ -181,7 +181,7 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +delivering 10HmbC-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) SMTP>> MAIL FROM:<CALLER@test.ex> diff --git a/test/stderr/0433 b/test/stderr/0433 index 627968150..c178519ab 100644 --- a/test/stderr/0433 +++ b/test/stderr/0433 @@ -18,6 +18,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -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 >>>>>>>>>>>>>>>> @@ -40,6 +41,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -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 >>>>>>>>>>>>>>>> @@ -63,6 +65,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -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 >>>>>>>>>>>>>>>> @@ -86,6 +89,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -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 >>>>>>>>>>>>>>>> @@ -110,6 +114,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -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 >>>>>>>>>>>>>>>> @@ -134,6 +139,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen 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 search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0438 b/test/stderr/0438 index 4dc97dd84..b50e6e30a 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -20,6 +20,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen 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 search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -43,6 +44,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen 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 search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -66,6 +68,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen 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 search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0476 b/test/stderr/0476 index d23c2d6fc..2ea100bdc 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -6,7 +6,7 @@ set_process_info: pppp running the queue (single queue run) LOG: queue_run MAIN Start queue run: pid=pppp set_process_info: pppp running queue: 10HmaX-0005vi-00-H -set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp) +set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid pppp) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- set_process_info: pppp delivering 10HmaX-0005vi-00 using t1 @@ -107,7 +107,7 @@ LOG: MAIN set_process_info: pppp running queue: waiting for children of pppp set_process_info: pppp running queue set_process_info: pppp running queue: 10HmaY-0005vi-00-H -set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp) +set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid pppp) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> usery@test.ex <-------- set_process_info: pppp delivering 10HmaY-0005vi-00 using t1 diff --git a/test/stderr/0609 b/test/stderr/0609 index 54e45a7a6..2ae8a95bd 100644 --- a/test/stderr/0609 +++ b/test/stderr/0609 @@ -50,4 +50,5 @@ ppppp LOG: lost_incoming_connection MAIN ppppp unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>> ppppp 1 SMTP accept process running +ppppp SIGTERM seen ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0621 b/test/stderr/0621 new file mode 100644 index 000000000..045fadc9b --- /dev/null +++ b/test/stderr/0621 @@ -0,0 +1,2 @@ + +******** SERVER ******** diff --git a/test/stderr/1007 b/test/stderr/1007 index 098c83845..acadf2270 100644 --- a/test/stderr/1007 +++ b/test/stderr/1007 @@ -19,6 +19,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -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 >>>>>>>>>>>>>>>> @@ -43,6 +44,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -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 >>>>>>>>>>>>>>>> @@ -68,6 +70,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -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 >>>>>>>>>>>>>>>> @@ -93,6 +96,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -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 >>>>>>>>>>>>>>>> @@ -115,6 +119,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -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 >>>>>>>>>>>>>>>> @@ -140,6 +145,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1227 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -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 >>>>>>>>>>>>>>>> @@ -166,6 +172,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -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 >>>>>>>>>>>>>>>> @@ -191,6 +198,7 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... +SIGTERM seen 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 search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/1150 b/test/stderr/1150 index 395644cb1..f339bfc96 100644 --- a/test/stderr/1150 +++ b/test/stderr/1150 @@ -1,6 +1,6 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed @@ -32,7 +32,7 @@ LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN Completed -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed diff --git a/test/stderr/1160 b/test/stderr/1160 index 3b0b5c0a3..6a2b72e90 100644 --- a/test/stderr/1160 +++ b/test/stderr/1160 @@ -1,6 +1,6 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed @@ -23,7 +23,7 @@ LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN Completed -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO helo.data.changed diff --git a/test/stderr/2201 b/test/stderr/2201 index 86f88b1a3..80ebe911e 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -235,4 +235,5 @@ ppppp child ppppp ended: status=0x0 ppppp normal exit, 0 ppppp 0 SMTP accept processes now running ppppp Listening... +ppppp SIGTERM seen ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> |