# Debug time & pid
-$time_pid = "(?:\\d{2}:\\d{2}:\\d{2}\\s+\\d+\\s)";
+$time_pid = "(?:(?:\\d{2}:\\d{2}:\\d{2}\\s+)?\\d+\\s)";
# Pattern for matching pids at start of stderr lines; initially something
# that won't match.
(?: .*\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=
# 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:/;
# different libraries will have different numbers (possibly 0) of follow-up
# lines, indenting with more data
if (/^$time_pid?Library version:/) {
- while (1) {
+ $_ = <IN>;
+ if (/^$time_pid?\s/) {
$_ = <IN>;
- next if /^$time_pid?\s/;
- goto RESET_AFTER_EXTRA_LINE_READ;
+ if (/^$time_pid?\s/) {
+ $_ = <IN>;
+ }
}
+ goto RESET_AFTER_EXTRA_LINE_READ;
}
# drop other build-time controls emitted for debugging
}
# 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%;
next if /^DKIM >> Body data for hash, canonicalized/;
# Not all platforms build with SPF enabled
- next if /(^spf_conn_init|^SPF_dns_exim_new|spf_compile\.c)/;
+ next if /(^$time_pid?spf_conn_init|spf_compile\.c)/;
next if /try option spf_smtp_comment_template$/;
+ next if /loading module 'spf'$/;
+ next if /^Loaded "spf"$/;
# Not all platforms have sendfile support
next if /^cannot use sendfile for body: no support$/;
%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"))
{
git://git.exim.org / exim.git / blobdiff