s/\d\d-\w\w\w-\d\d\d\d\s\d\d:\d\d:\d\d\s[-+]\d\d\d\d,/06-Sep-1999 15:52:48 +0100,/gx;
# Dates/times in debugging output for writing retry records
- if (/^(\s+)first failed=(\d+) last try=(\d+) next try=(\d+) (.*)$/)
+ if (/^(.+)first failed=(\d+) last try=(\d+) next try=(\d+) (.*)$/)
{
my($next) = $4 - $3;
$_ = "$1first failed=dddd last try=dddd next try=+$next $5\n";
}
- s/^(\s*)now=\d+ first_failed=\d+ next_try=\d+ expired=(\w)/$1now=tttt first_failed=tttt next_try=tttt expired=$2/;
- s/^(\s*)received_time=\d+ diff=\d+ timeout=(\d+)/$1received_time=tttt diff=tttt timeout=$2/;
+ s/^(.*)now=\d+ first_failed=\d+ next_try=\d+ expired=(\w)/$1now=tttt first_failed=tttt next_try=tttt expired=$2/;
+ s/^(.*)received_time=\d+ diff=\d+ timeout=(\d+)/$1received_time=tttt diff=tttt timeout=$2/;
# Time to retry may vary
s/time to retry = \S+/time to retry = tttt/;
(?: .*\sBerkeley\ DB
| \sProbably\ (?:Berkeley\ DB|ndbm|GDBM)
| \sUsing\ (?:tdb|sqlite3)
- | Authenticators:
+ | Authenticators\ \((?:built-in|dynamic)\):
| Lookups(?:\(built-in\))?:
| Support\ for:
- | Routers:
- | Transports:
+ | Routers\ \((?:built-in|dynamic)\):
+ | Transports\ \((?:built-in|dynamic)\):
| Malware:
| log\ selectors\ =
| cwd=
next if /lock(?:ing|ed) .*\/spool\/db\/[^.]+\.lockfile$/;
s/closed hints database\K and lockfile$//;
+ # Hints DBs with transactions are provider-dependent, and flow changes
+ # to take advantage of them need different opens and different flags.
+ # Drop all the debug output for opens and closes.
+ if (/EXIM_DBOPEN(_MULTI)?: file <.*spool\/db\/retry>/)
+ {
+ $_ = <IN>;
+ next if (/returned from EXIM_DBOPEN(_MULTI)?: 0x[[:xdigit:]]+$/);
+ $_ = <IN>;
+ <IN> if (/returned from EXIM_DBOPEN(_MULTI)?: \(nil\)$/);
+ next;
+ }
+ if (/EXIM_DBCLOSE(_MULTI)?/) { <IN>; next; }
+ next if /retaining retry hintsdb handle$/;
+ next if /using cached retry hintsdb (?:handle|nonpresence)$/;
+ if (/final close of cached retry db$/) { <IN>; <IN>; next; }
+ next if /dbfn_transaction_(?:start|commit)$/;
+
+ # Various hintsdb backends
+ s/(?:bdb|tdb|gdbm|ndbm|sqlite)
+ _open\(flags\ 0x(\d)
+ \ mode\ 0640\)
+ \ (?:No\ such\ file\ or\ directory|unable\ to\ open\ database\ file)$
+ /hintsdb_open(flags 0x$1 mode 0640) No such file or directory/x;
+
# Lines with a leading pid. Only handle >= 4-digit PIDs to avoid converting SMTP respose codes
s/^\s*(\d{4,})\s(?!(?:previous message|in\s|bytes remain in|SMTP accept process running))/new_value($1, "p%s", \$next_pid) . ' '/e;
+ # Connection IDs
+ s/connection_id: \K(\d+)$/new_value($1, "conn%s", \$next_conn)/e;
+
# Debugging lines for Exim terminations and process-generation
next if /(?:postfork: | fork(?:ing|ed) for )/;
# Lookups have a char which depends on the number of lookup types compiled in,
# in stderr output. Replace with a "0". Recognising this while avoiding
# other output is fragile; perhaps the debug output should be revised instead.
- s%^\s+(:?closing )?\K[0-?]TESTSUITE/aux-fixed/%0TESTSUITE/aux-fixed/%g;
+ s%^\s+(?:closing )?\K[0-Z]TESTSUITE/aux-fixed/%0TESTSUITE/aux-fixed/%g;
# drop gnutls version strings
next if /GnuTLS compile-time version: \d+[\.\d]+$/;
next if /^tls_set_watch\(\) fail on '\/usr\/(?:lib\/ssl|local\/openssl3\/etc\/pki\/tls)\/cert.pem': No such file or directory$/;
# drop lookups
- next if /^$time_pid?(?: Lookups\ \(built-in\):
- | Loading\ lookup\ modules\ from
- | Loaded\ \d+\ lookup\ modules
- | Total\ \d+\ lookups)/x;
+ next if /(?: Lookups\ \((?:built-in|dynamic)\):
+ | searchtype\ \w+\ not\ initially\ found
+ | Loaded\ "\w+"\ \(\d+\ lookup\ types?\)
+ | Loading\ lookup\ modules\ from
+ | Loaded\ \d+\ lookup\ modules
+ | Total\ \d+\ built-in\ lookups)/x;
+
+ # drop loads of dyn-module drivers
+ next if /^$time_pid?(?:Loading\ \w+\ (?:router|transport|auth)\ driver\ from
+ | Loaded\ \w+\ (?:router|transport|auth)$)/x;
# drop compiler information
next if /^$time_pid?Compiler:/;
next if /failed to load readline:/;
- # Some DBM libraries seem to make DBM files on opening with O_RDWR without
- # O_CREAT; other's don't. In the latter case there is some debugging output
- # which is not present in the former. Skip the relevant lines (there are
- # three of them).
-
- if (/returned from EXIM_DBOPEN: \(nil\)/)
- {
- $_ .= <IN>;
- s?\Q$parm_cwd\E?TESTSUITE?g;
- if (/TESTSUITE\/spool\/db\/\S+ appears not to exist: trying to create/)
- { $_ = <IN>; next; }
- }
-
# Some tests turn on +expand debugging to check on expansions.
# Unfortunately, the Received: expansion varies, depending on whether TLS
# is compiled or not. So we must remove the relevant debugging if it is.
}
# Different builds will have different lookup types included
- s/search_type \K\d+ \((\w+)\) quoting -1 \(none\)$/NN ($1) quoting -1 (none)/;
+ s/required_quoter_id \K\d+ \((\w+)\) quoting -1 \(NULL\)$/NN ($1) quoting -1 (NULL)/;
# and different numbers of lookup types result in different type-code letters,
# so convert them all to "0"
s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
}
# Specific pointer values reported for DB operations change from run to run
- s/^(\s*returned from EXIM_DBOPEN: )(0x)?[0-9a-f]+/${1}0xAAAAAAAA/;
- s/^(\s*EXIM_DBCLOSE.)(0x)?[0-9a-f]+/${1}0xAAAAAAAA/;
+ s/(returned from EXIM_DBOPEN: )(0x)?[0-9a-f]+/${1}0xAAAAAAAA/;
+ s/(EXIM_DBCLOSE.)(0x)?[0-9a-f]+/${1}0xAAAAAAAA/;
# Platform-dependent output during MySQL startup
next if /PerconaFT file system space/;
%parm_support = @temp;
}
- elsif (/^Lookups \(built-in\): (.*)/)
+ elsif (/^Lookups \((?:built-in|dynamic)\): ?(.*)/)
{
print;
@temp = split /(\s+)/, $1;
push(@temp, ' ');
- %parm_lookups = @temp;
+ my %temp_lookups = @temp;
+ @parm_lookups{keys %temp_lookups} = values %temp_lookups;
}
- elsif (/^Authenticators: (.*)/)
+ elsif (/^Authenticators \((?:built-in|dynamic)\): ?(.*)/)
{
print;
@temp = split /(\s+)/, $1;
push(@temp, ' ');
- %parm_authenticators = @temp;
+ my %temp_auths= @temp;
+ @parm_authenticators{keys %temp_auths} = values %temp_auths;
}
- elsif (/^Routers: (.*)/)
+ elsif (/^Routers \((?:built-in|dynamic)\): ?(.*)/)
{
print;
@temp = split /(\s+)/, $1;
push(@temp, ' ');
- %parm_routers = @temp;
+ my %temp_routers = @temp;
+ @parm_routers{keys %temp_routers} = values %temp_routers;
}
# Some transports have options, e.g. appendfile/maildir. For those, ensure
# that the basic transport name is set, and then the name with each of the
# options.
- elsif (/^Transports: (.*)/)
+ elsif (/^Transports \((?:built-in|dynamic)\): (.*)/)
{
print;
@temp = split /(\s+)/, $1;
my($i,$k);
push(@temp, ' ');
- %parm_transports = @temp;
+ my %temp_transports = @temp;
+ @parm_transports{keys %temp_transports} = values %temp_transports;
+
foreach $k (keys %parm_transports)
{
if ($k =~ "/")
"sudo chgrp $parm_eximgroup eximdir/exim_exim;" .
"sudo chmod 06755 eximdir/exim_exim");
+# Copy any libraries that were built for dynamic load
+# Currently this is only for lookup methods
+
+($parm_exim_dir) = $parm_exim =~ m?^(.*)/exim?;
+
+while (my $file = glob("$parm_exim_dir/dynmodules/*.so")) {
+ my $base = basename($file);
+ cp("$file", "eximdir/");
+ system("sudo chmod 755 eximdir/$base");
+ }
+
##################################################
# Make copies of utilities we might need #
##################################################
# Certain of the tests make use of some of Exim's utilities. We do not need
# to be root to copy these.
-($parm_exim_dir) = $parm_exim =~ m?^(.*)/exim?;
-
$dbm_build_deleted = 0;
if (defined $parm_lookups{dbm} && not cp("$parm_exim_dir/exim_dbmbuild", "eximdir/exim_dbmbuild"))
{
$next_msgid = "aX";
$next_pid = 1234;
$next_port = 1111;
+ $next_conn = 1111;
$message_skip = 0;
$msglog_skip = 0;
$munge_skip = 0;
git://git.exim.org / exim.git / blobdiff