git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f759886
)
Testsuite: platform variances
author
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 29 May 2019 13:14:24 +0000
(14:14 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 29 May 2019 13:14:24 +0000
(14:14 +0100)
test/runtest
patch
|
blob
|
history
diff --git
a/test/runtest
b/test/runtest
index 1b6eaabb002f66dfefd4e17d8131fcdcb29d255c..9effe3479eb86aa1f65d62bec9929af5248df8a8 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1154,6
+1154,9
@@
RESET_AFTER_EXTRA_LINE_READ:
# remote port numbers vary
s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/;
# remote port numbers vary
s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/;
+ # Platform-dependent error strings
+ s/Operation timed out/Connection timed out/;
+
# 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 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;
@@
-1222,7
+1225,7
@@
RESET_AFTER_EXTRA_LINE_READ:
Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.
\ .*TFO\ mode\
(sendto,\ no\ data:\ EINPROGRESS # Linux
Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.
\ .*TFO\ mode\
(sendto,\ no\ data:\ EINPROGRESS # Linux
- |connection\ attempt\ to\ [^,]+,\ 0\ data) # MacOS
+ |connection\ attempt\ to\ [^,]+,\ 0\ data) # MacOS
& no-support
$/x)
{
$_ = $1 . " ... " . <IN>;
$/x)
{
$_ = $1 . " ... " . <IN>;