git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: completely omit 127/8 IPs
[users/heiko/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index c3faa4262be19c29421ea3e0b362fa31c88464ee..bfc02eda28e2176b9c24d3585556d673ee599a9a 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-165,7
+165,7
@@
if (exists $TEST_STATE->{exim_pid})
{
$pid = $TEST_STATE->{exim_pid};
print "Tidyup: killing wait-mode daemon pid=$pid\n";
{
$pid = $TEST_STATE->{exim_pid};
print "Tidyup: killing wait-mode daemon pid=$pid\n";
- system("sudo kill -
SIG
INT $pid");
+ system("sudo kill -INT $pid");
}
if (opendir(DIR, "spool"))
}
if (opendir(DIR, "spool"))
@@
-179,7
+179,7
@@
if (opendir(DIR, "spool"))
chomp($pid = <PID>);
close(PID);
print "Tidyup: killing daemon pid=$pid\n";
chomp($pid = <PID>);
close(PID);
print "Tidyup: killing daemon pid=$pid\n";
- system("sudo rm -f spool/$spool; sudo kill -
SIG
INT $pid");
+ system("sudo rm -f spool/$spool; sudo kill -INT $pid");
}
}
else
}
}
else
@@
-497,6
+497,7
@@
RESET_AFTER_EXTRA_LINE_READ:
# different protocols; can't rely upon TLS 1.2's AES256-GCM-SHA384, so we
# treat the standard algorithms the same.
# So far, have seen:
# different protocols; can't rely upon TLS 1.2's AES256-GCM-SHA384, so we
# treat the standard algorithms the same.
# So far, have seen:
+ # TLSv1:AES128-GCM-SHA256:128
# TLSv1:AES256-SHA:256
# TLSv1.1:AES256-SHA:256
# TLSv1.2:AES256-GCM-SHA384:256
# TLSv1:AES256-SHA:256
# TLSv1.1:AES256-SHA:256
# TLSv1.2:AES256-GCM-SHA384:256
@@
-509,6
+510,8
@@
RESET_AFTER_EXTRA_LINE_READ:
# (and \b doesn't match between ' ' and '(' )
s/( (?: (?:\b|\s) [\(=] ) | \s )TLSv1\.[12]:/$1TLSv1:/xg;
# (and \b doesn't match between ' ' and '(' )
s/( (?: (?:\b|\s) [\(=] ) | \s )TLSv1\.[12]:/$1TLSv1:/xg;
+ s/\bAES128-GCM-SHA256:128\b/AES256-SHA:256/g;
+ s/\bAES128-GCM-SHA256\b/AES256-SHA/g;
s/\bAES256-GCM-SHA384\b/AES256-SHA/g;
s/\bDHE-RSA-AES256-SHA\b/AES256-SHA/g;
s/\bAES256-GCM-SHA384\b/AES256-SHA/g;
s/\bDHE-RSA-AES256-SHA\b/AES256-SHA/g;
@@
-837,6
+840,7
@@
RESET_AFTER_EXTRA_LINE_READ:
# openssl version variances
next if /^SSL info: unknown state/;
next if /^SSL info: SSLv2\/v3 write client hello A/;
# openssl version variances
next if /^SSL info: unknown state/;
next if /^SSL info: SSLv2\/v3 write client hello A/;
+ next if /^SSL info: SSLv3 read server key exchange A/;
}
}
@@
-999,6
+1003,11
@@
RESET_AFTER_EXTRA_LINE_READ:
@saved = ();
}
@saved = ();
}
+ # Skip hosts_require_dane checks when the options
+ # are unset, because dane ain't always there.
+
+ next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
+
# Skip some lines that Exim puts out at the start of debugging output
# because they will be different in different binaries.
# Skip some lines that Exim puts out at the start of debugging output
# because they will be different in different binaries.
@@
-1293,7
+1302,7
@@
$munges =
{ 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/', },
'tpda' =>
{ 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/', },
'tpda' =>
- { 'stdout' => '/tpda_
delivery
_action =/', },
+ { 'stdout' => '/tpda_
event
_action =/', },
};
};
@@
-1747,14
+1756,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 -
SIG
INT $pid");
+ run_system("sudo /bin/kill -INT $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 -
SIG
INT $pid");
+ run_system("sudo /bin/kill -INT $pid");
close DAEMONCMD; # Waits for process
}
}
close DAEMONCMD; # Waits for process
}
}
@@
-2752,7
+2761,7
@@
while (($parm_ipv4 eq "" || $parm_ipv6 eq "") && ($_ = <IFCONFIG>))
$_ =~ /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)\s/i)
{
$ip = $1;
$_ =~ /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)\s/i)
{
$ip = $1;
- next if ($ip
eq "127.0.0.1"
);
+ next if ($ip
=~ /^127\./
);
$parm_ipv4 = $ip;
}
$parm_ipv4 = $ip;
}