diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/log/0438 | 1 | ||||
| -rwxr-xr-x | test/runtest | 1 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0438 | 13 | ||||
| -rw-r--r-- | test/stderr/0438 | 22 | ||||
| -rw-r--r-- | test/stdout/0438 | 3 |
5 files changed, 40 insertions, 0 deletions
diff --git a/test/log/0438 b/test/log/0438 index 574cf9bef..78796810d 100644 --- a/test/log/0438 +++ b/test/log/0438 @@ -2,3 +2,4 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D diff --git a/test/runtest b/test/runtest index 9f6569128..97edbc244 100755 --- a/test/runtest +++ b/test/runtest @@ -1029,6 +1029,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/; s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/; + s/^(?:\d+)( exec .* -oPX)$/pppp$1/; # IP address lookups use gethostbyname() when IPv6 is not supported, # and gethostbyname2() or getipnodebyname() when it is. diff --git a/test/scripts/0000-Basic/0438 b/test/scripts/0000-Basic/0438 index 099efba0d..a8287cf9f 100644 --- a/test/scripts/0000-Basic/0438 +++ b/test/scripts/0000-Basic/0438 @@ -8,3 +8,16 @@ killdaemon exim -d -DSERVER=server -bd -oX PORT_D -oP DIR/spool/exim-daemon.anotherpid **** killdaemon +# +# Check for a SIGTERM daemon kill removing the pid file +exim -d -DSERVER=server -bd -oX PORT_D -oP DIR/spool/mypidfile +**** +sleep 1 +ls DIR/spool +sudo perl +open(IN, "<", "DIR/spool/mypidfile"); +while (<IN>) { kill "TERM", $_; } +**** +sleep 1 +ls DIR/spool +# diff --git a/test/stderr/0438 b/test/stderr/0438 index f44d7bb76..bb6ba3f53 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -36,3 +36,25 @@ 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... +Exim version x.yz .... +changed uid/gid: forcing real = effective + uid=uuuu gid=CALLER_GID pid=pppp +configuration file is TESTSUITE/test-config +admin user +dropping to exim gid; retaining priv uid +originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME +daemon_smtp_port overridden by -oX: + <: 1225 +listening on all interfaces (IPv4) port 1225 +pid written to TESTSUITE/spool/mypidfile +changed uid/gid: running as a daemon + uid=EXIM_UID gid=EXIM_GID pid=pppp +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 +daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID +Listening... +OpenSSL: creating STEK +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/mypidfile -oPX +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stdout/0438 b/test/stdout/0438 new file mode 100644 index 000000000..431c133d8 --- /dev/null +++ b/test/stdout/0438 @@ -0,0 +1,3 @@ +log +mypidfile +log |