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
Apply timeout consistently to all malware scanner types
[users/jgh/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index c6111678fe1b74a9fd364b6ee32316a56562b151..f79d51e872fb7a62447efc6d64a6a65e7d7ea37c 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-806,7
+806,7
@@
RESET_AFTER_EXTRA_LINE_READ:
# ==========================================================
# MIME boundaries in RFC3461 DSN messages
# ==========================================================
# MIME boundaries in RFC3461 DSN messages
- s/\d{8,10}-eximdsn-\d
{8,10}
/NNNNNNNNNN-eximdsn-MMMMMMMMMM/;
+ s/\d{8,10}-eximdsn-\d
+
/NNNNNNNNNN-eximdsn-MMMMMMMMMM/;
# ==========================================================
# Some munging is specific to the specific file types
# ==========================================================
# Some munging is specific to the specific file types
@@
-1302,19
+1302,25
@@
return 1;
##################################################
$munges =
{ 'dnssec' =>
##################################################
$munges =
{ 'dnssec' =>
- { 'stderr' => '/^Reverse DNS security status: unverified\n/'
,
},
+ { 'stderr' => '/^Reverse DNS security status: unverified\n/' },
'gnutls_unexpected' =>
'gnutls_unexpected' =>
- { 'mainlog' => '/\(recv\): A TLS packet with unexpected length was received./'
,
},
+ { 'mainlog' => '/\(recv\): A TLS packet with unexpected length was received./' },
'gnutls_handshake' =>
'gnutls_handshake' =>
- { 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/'
,
},
+ { 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/' },
'optional_events' =>
'optional_events' =>
- { 'stdout' => '/event_action =/'
,
},
+ { 'stdout' => '/event_action =/' },
'optional_ocsp' =>
'optional_ocsp' =>
- { 'stderr' => '/127.0.0.1 in hosts_requ(ire|est)_ocsp/', },
+ { 'stderr' => '/127.0.0.1 in hosts_requ(ire|est)_ocsp/' },
+
+ 'no_tpt_filter_epipe' =>
+ { 'stderr' => '/^writing error 32: Broken pipe$/' },
+
+ 'optional_cert_hostnames' =>
+ { 'stderr' => '/in tls_verify_cert_hostnames\? no/' },
};
};