# 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\ \((?:built-in|dynamic)\):
# 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|dynamic)\):
- | Loaded\ "[^.]+\.so"\ \(\d+\ lookup\ types\)
- | 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
# 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)/;
# 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%;
<IN>; <IN>; <IN>; <IN>; <IN>; next;
}
+ # various features can be built as dynamic-load modules
+ next if /loading module '(?:arc|exim_filter|dkim|dmarc|pam|perl|radius|sieve_filter|spf)'$/;
+
# Not all platforms build with DKIM enabled
next if /^DKIM >> Body data for hash, canonicalized/;
+ # Not all platforms build with SOCKS enabled
+ next if /^try option socks_proxy$/;
+
# 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 /^$time_pid?Loaded "(?:dkim|dmarc|exim_filter|spf)"$/;
# Not all platforms have sendfile support
next if /^cannot use sendfile for body: no support$/;
s/ \[\d+\] (?=(LOG: redirecting log|HINT: Future log output))/ [pppp] /;
# Not all builds include DMARC
+ next if /try option dmarc_tld_file$/;
next if /^DMARC: no (dmarc_tld_file|sender_host_address)$/ ;
# Platform differences in errno strings
@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 \((?:built-in|dynamic)\): ?(.*)/)
"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?;
$" = ' ';
}
+ my $testnum = 0;
+ if ($file =~ /^(\d+)/) { $testnum = $1; }
+
print ">>Copying $basedir-src/$file to $basedir/$outfile\n" if $debug;
open(IN, "$parm_cwd/$basedir-src/$file") ||
tests_exit(-1, "Failed to open $parm_cwd/$basedir-src/$file: $!");
tests_exit(-1, "Failed to open $parm_cwd/$basedir/$outfile: $!");
while (<IN>)
{
- do_substitute(0);
+ do_substitute($testnum);
print OUT;
}
close(IN);