git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: Move 2040 to 1101 (hanging pipelining connections)
[users/jgh/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index d9db2ccc8be3a3aca5be49e29fcf7497c83265ee..ffa0a7112973c3bb5c6ba5ede43fe128b975fa2c 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1211,6
+1211,11
@@
RESET_AFTER_EXTRA_LINE_READ:
# are unset, because dane ain't always there.
next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
# are unset, because dane ain't always there.
next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
+ # daemon notifier socket
+ s/^(creating notifier socket) .*$/$1/;
+ s/^(\s*\d+|ppppp) (creating notifier socket) .+$/ppppp $2/;
+ next if /unlinking notifier socket/;
+
# DISABLE_OCSP
next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
# DISABLE_OCSP
next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
@@
-2327,8
+2332,7
@@
if (/^gnutls/)
# The "killdaemon" command should ultimately follow the starting of any Exim
# The "killdaemon" command should ultimately follow the starting of any Exim
-# daemon with the -bd option. We kill with SIGINT rather than SIGTERM to stop
-# it outputting "Terminated" to the terminal when not in the background.
+# daemon with the -bd option.
if (/^killdaemon/)
{
if (/^killdaemon/)
{
@@
-2340,14
+2344,14
@@
if (/^killdaemon/)
print ">> killdaemon: recovered pid $pid\n" if $debug;
if ($pid)
{
print ">> killdaemon: recovered pid $pid\n" if $debug;
if ($pid)
{
- run_system("sudo /bin/kill -
INT
$pid");
+ run_system("sudo /bin/kill -
TERM
$pid");
wait;
}
} else {
$pid = `cat $parm_cwd/spool/exim-daemon.*`;
if ($pid)
{
wait;
}
} else {
$pid = `cat $parm_cwd/spool/exim-daemon.*`;
if ($pid)
{
- run_system("sudo /bin/kill -
INT
$pid");
+ run_system("sudo /bin/kill -
TERM
$pid");
close DAEMONCMD; # Waits for process
}
}
close DAEMONCMD; # Waits for process
}
}