projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'SMTPUTF8_1516'. Bug 1516
[exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index 9fd8188793626266a7d87dc8d544c36f4223131e..4a4427839385f54fd03bd409e015df88d174e19c 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-413,6
+413,7
@@
RESET_AFTER_EXTRA_LINE_READ:
# Random local part in callout cache testing
s/myhost.test.ex-\d+-testing/myhost.test.ex-dddddddd-testing/;
# Random local part in callout cache testing
s/myhost.test.ex-\d+-testing/myhost.test.ex-dddddddd-testing/;
+ s/the.local.host.name-\d+-testing/the.local.host.name-dddddddd-testing/;
# File descriptor numbers may vary
s/^writing data block fd=\d+/writing data block fd=dddd/;
# File descriptor numbers may vary
s/^writing data block fd=\d+/writing data block fd=dddd/;
@@
-491,6
+492,9
@@
RESET_AFTER_EXTRA_LINE_READ:
s/Exim\sstatistics\sfrom\s\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\sto\s
\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from <time> to <time>/x;
s/Exim\sstatistics\sfrom\s\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\sto\s
\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from <time> to <time>/x;
+ # Treat ECONNRESET the same as ECONNREFUSED. At least some systems give
+ # us the former on a new connection.
+ s/(could not connect to .*: Connection) reset by peer$/$1 refused/;
# ======== TLS certificate algorithms ========
# Test machines might have various different TLS library versions supporting
# ======== TLS certificate algorithms ========
# Test machines might have various different TLS library versions supporting
@@
-806,7
+810,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
@@
-841,7
+845,6
@@
RESET_AFTER_EXTRA_LINE_READ:
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/;
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/;
-
}
# ======== stderr ========
}
# ======== stderr ========
@@
-1008,6
+1011,9
@@
RESET_AFTER_EXTRA_LINE_READ:
next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
+ # Experimental_International
+ next if / in smtputf8_advertise_hosts\? no \(option unset\)/;
+
# 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.
@@
-1024,6
+1030,8
@@
RESET_AFTER_EXTRA_LINE_READ:
/^Fixed never_users:/ ||
/^Size of off_t:/
);
/^Fixed never_users:/ ||
/^Size of off_t:/
);
+
+
}
next;
}
next;
@@
-1322,6
+1330,9
@@
$munges =
'optional_cert_hostnames' =>
{ 'stderr' => '/in tls_verify_cert_hostnames\? no/' },
'optional_cert_hostnames' =>
{ 'stderr' => '/in tls_verify_cert_hostnames\? no/' },
+ 'loopback' =>
+ { 'stdout' => 's/[[](127\.0\.0\.1|::1)]/[IP_LOOPBACK_ADDR]/' },
+
};
};
@@
-1339,7
+1350,7
@@
$munges =
# [4] TRUE if this is a log file whose deliveries must be sorted
# [5] an optional custom munge command
#
# [4] TRUE if this is a log file whose deliveries must be sorted
# [5] an optional custom munge command
#
-# Arguments: Optionally, name of a custom munge to run.
+# Arguments: Optionally, name of a
single
custom munge to run.
# Returns: 0 if the output compared equal
# 1 if re-run needed (files may have been updated)
# Returns: 0 if the output compared equal
# 1 if re-run needed (files may have been updated)
@@
-1683,7
+1694,7
@@
if (/^dump\s+(\S+)/)
foreach $item (@temp)
{
foreach $item (@temp)
{
- $item =~ s/^\s*(.*)\n(.*)\n?\s*$/
\1\n\
2/m;
+ $item =~ s/^\s*(.*)\n(.*)\n?\s*$/
$1\n$
2/m;
print OUT " $item\n";
}
}
print OUT " $item\n";
}
}
@@
-3402,6
+3413,7
@@
foreach $test (@test_list)
$stdout_skip = 0;
$rmfiltertest = 0;
$is_ipv6test = 0;
$stdout_skip = 0;
$rmfiltertest = 0;
$is_ipv6test = 0;
+ $TEST_STATE->{munge} = "";
# Remove the associative arrays used to hold checked mail files and msglogs
# Remove the associative arrays used to hold checked mail files and msglogs