X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0ed616733949ce8975d2ff8f183ecdf5291a944d..aff5e0c480dd4ac2ccd15906c250c18c93ac7f12:/test/runtest diff --git a/test/runtest b/test/runtest index a163a7145..bb9b1ceee 100755 --- a/test/runtest +++ b/test/runtest @@ -2,6 +2,9 @@ # We use env, because in some environments of our build farm # the Perl 5.010 interpreter is only reachable via $PATH +# Copyright (c) The Exim Maintainers 2024 +# SPDX-License-Identifier: GPL-2.0-or-later + ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # # be possible to export this suite for running on a wide variety of hosts, in # @@ -115,6 +118,14 @@ my ($parm_configure_owner, $parm_configure_group); my ($parm_ipv4, $parm_ipv6, $parm_ipv6_stripped); my $parm_hostname; +# Convenience for regex' +# for tighter, see https://metacpan.org/dist/IO-Socket-IP/source/lib/IO/Socket/IP.pm#L37 +my $re_ipv4 = qr/\d{1,3}(?:\.\d{1,3}){3}/; +my $re_6g = qr/[[:xdigit:]]{1,4}/; +my $re_6s = qr/${re_6g}:/; +my $re_ipv6 = qr/${re_6s}{0,7}${re_6g}(?:::${re_6s}{0,5}${re_6g})?/; +my $re_ip = qr/(?:${re_ipv4}|${re_ipv6})/; + ############################################################################### ############################################################################### @@ -372,7 +383,7 @@ $date = "\\d{2}-\\w{3}-\\d{4}\\s\\d{2}:\\d{2}:\\d{2}"; # 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. @@ -458,7 +469,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/forced fail after \d seconds/forced fail after d seconds/; # This message may contain a different DBM library name - s/Failed to open \S+( \([^\)]+\))? file/Failed to open DBM file/; + s/Failed to open \S+( \([^\)]+\))? file/Failed to open hintsdb file/; # The message for a non-listening FIFO varies s/:[^:]+: while opening named pipe/: Error: while opening named pipe/; @@ -484,8 +495,10 @@ RESET_AFTER_EXTRA_LINE_READ: my($date1,$date2,$date3,$expired) = ($1,$2,$3,$4); $expired = '' if !defined $expired; - # Round the time-difference up to nearest even value - my($increment) = ((date_seconds($date3) - date_seconds($date2) + 1) >> 1) << 1; + # Make time-difference minimum 2, and rounded up to even value + my($increment) = date_seconds($date3) - date_seconds($date2) + 1; + $increment = 2 if ($increment == 0); + $increment = ($increment >> 1) << 1; # We used to use globally unique replacement values, but timing # differences make this impossible. Just show the increment on the @@ -564,13 +577,13 @@ RESET_AFTER_EXTRA_LINE_READ: 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 (/^ first failed=(\d+) last try=(\d+) next try=(\d+) (.*)$/) + if (/^(.+)first failed=(\d+) last try=(\d+) next try=(\d+) (.*)$/) { - my($next) = $3 - $2; - $_ = " first failed=dddd last try=dddd next try=+$next $4\n"; + 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/; @@ -713,7 +726,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/TLS error on connection \(gnutls_handshake\): Error in the pull function\./a TLS session is required but an attempt to start TLS failed/g; # (replace old with new, hoping that old only happens in one situation) - s/TLS error on connection to \d{1,3}(.\d{1,3}){3} \[\d{1,3}(.\d{1,3}){3}\] \(gnutls_handshake\): A TLS packet with unexpected length was received./a TLS session is required for ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4], but an attempt to start TLS failed/g; + s/TLS error on connection to ${re_ipv4} \[${re_ipv4}\] \(gnutls_handshake\): A TLS packet with unexpected length was received./a TLS session is required for ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4], but an attempt to start TLS failed/g; s/TLS error on connection from \[127.0.0.1\] \(recv\): A TLS packet with unexpected length was received./TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated./g; # signature algorithm names @@ -823,12 +836,12 @@ RESET_AFTER_EXTRA_LINE_READ: s/\(port=(\d+)/"(port=" . new_value($1, "%s", \$next_port)/e; # This handles "connection from" and the like, when the port is given - if (!/listening for SMTP on/ && !/Connecting to/ && !/=>/ && !/->/ - && !/\*>/&& !/==/ && !/\*\*/ && !/Connection refused/ && !/in response to/ - && !/T(?:ransport)?:/) - { - s/\[([a-z\d:]+|\d+(?:\.\d+){3})\]:(\d+)/"[".$1."]:".new_value($2,"%s",\$next_port)/ie; - } + s/(\[${re_ip}\]:)(\d+)/$1.new_value($2,"%s",\$next_port)/ie + unless ( /listening for SMTP on/ || /Connecting to/ + || /[=*-]>/ || /==/ || /\*\*/ + || /Connection refused/ || /in response to/ + || /T(?:ransport)?:/ + ); # Port in host address in spool file output from -Mvh s/^(--?host_address) (.*[:.])\d+$/$1 ${2}9999/; @@ -911,7 +924,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/([\s,])S=\d+\b/$1S=sss/; s/:S\d+\b/:Ssss/; - s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[a-z0-9-]{23}|[a-z0-9-]{18}) <)/TTT sss$2/i if $is_stdout; + s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[[:alnum:]-]{23}|[[:alnum:]-]{16}) <)/TTT sss$2/i if $is_stdout; s/\sSIZE=\d+\b/ SIZE=ssss/; s/\ssize=\d+\b/ size=sss/ if $is_stderr; s/old size = \d+\b/old size = sssss/; @@ -952,8 +965,12 @@ RESET_AFTER_EXTRA_LINE_READ: s/(TLS error on connection from .* \(SSL_\w+\): error:)(.*)/$1 <>/; next if /SSL verify error: depth=0 error=certificate not trusted/; + # OpenSSL 3.2.1 # OpenSSL 3.0.0 - s/TLS error \(D-H param setting .* error:\K.*dh key too small/xxxxxxxx:SSL routines::dh key too small/; + s/TLS\ error\ \(D-H\ param\ setting\ .*\ error:\K + .* + (?:dh\ key\ too\ small|unknown\ security\ bits) + /xxxxxxxx:SSL routines::dh key too small/x; # OpenSSL 1.1.1 s/error:\K0B080074:x509 certificate routines:X509_check_private_key(?=:key values mismatch$)/05800074:x509 certificate routines:/; @@ -1044,6 +1061,9 @@ RESET_AFTER_EXTRA_LINE_READ: # remote IPv6 addrs vary s/^(Connection request from) \[.*:.*:.*\]$/$1 \[ipv6\]/; + # Hints DB use of lockfiles is provider-dependent + s/Failed to open \K(?:hintsdb|database lock) file (.*\/spool\/db\/[^. ]*)(?:.lockfile)?(?: for reading)?(?=: No such file or directory$)/hintsdb $1/; + # openssl version variances # Error lines on stdout from SSL contain process id values and file names. # They also contain a source file name and line number, which may vary from @@ -1053,10 +1073,23 @@ RESET_AFTER_EXTRA_LINE_READ: next if /SSL verify error: depth=0 error=certificate not trusted/; s/SSL3_READ_BYTES/ssl3_read_bytes/i; s/CONNECT_CR_FINISHED/ssl3_read_bytes/i; - s/^[[:xdigit:]]+:error:[[:xdigit:]]+(?:E[[:xdigit:]]+)?(:SSL routines:ssl3_read_bytes:[^:]+:).*(:SSL alert number \d\d)$/pppp:error:dddddddd$1\[...\]$2/; + s/^[[:xdigit:]]+:error:[[:xdigit:]]+(?:E[[:xdigit:]]+)? + (:SSL\ routines:ssl3_read_bytes:) + ssl(?:v3|\/tls) + ([^:]+:) + .* + (:SSL\ alert\ number\ \d\d)$ + /pppp:error:dddddddd$1sslv3$2\[...\]$3/x; s/^error:\K[^:]*:(SSL routines:ssl3_read_bytes:(tls|ssl)v\d+ alert)/dddddddd:$1/; s/^error:\K[[:xdigit:]]+:SSL routines::(tlsv13 alert certificate required)$/dddddddd:SSL routines:ssl3_read_bytes:$1/; - s/^error:\K[[:xdigit:]]+:SSL routines::((tlsv1|sslv3) alert (unknown ca|certificate revoked))$/dddddddd:SSL routines:ssl3_read_bytes:$1/; + s/^error:\K + [[:xdigit:]]+:SSL\ routines:: + ((?:tlsv1|sslv3)\ alert\ (?:unknown\ ca|certificate\ revoked))$ + /dddddddd:SSL routines:ssl3_read_bytes:$1/x; + s/^error:\K + [[:xdigit:]]+:SSL\ routines:: + ssl\/tls\ (alert\ (?:unknown\ ca|certificate\ revoked))$ + /dddddddd:SSL routines:ssl3_read_bytes:sslv3 $1/x; # gnutls version variances next if /^Error in the pull function./; @@ -1124,14 +1157,14 @@ RESET_AFTER_EXTRA_LINE_READ: # because they will be different in different binaries. next if /^$time_pid? - (?: Berkeley\ DB:\s - | Probably\ (?:Berkeley\ DB|ndbm|GDBM) - | Using\ tdb - | Authenticators: + (?: .*\sBerkeley\ DB + | \sProbably\ (?:Berkeley\ DB|ndbm|GDBM) + | \sUsing\ (?:tdb|sqlite3) + | Authenticators\ \((?:built-in|dynamic)\): | Lookups(?:\(built-in\))?: | Support\ for: - | Routers: - | Transports: + | Routers\ \((?:built-in|dynamic)\): + | Transports\ \((?:built-in|dynamic)\): | Malware: | log\ selectors\ = | cwd= @@ -1141,9 +1174,40 @@ RESET_AFTER_EXTRA_LINE_READ: ) /x; + # Hints DB use of lockfiles is provider-dependent + 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>/) + { + $_ = ; + next if (/returned from EXIM_DBOPEN(_MULTI)?: 0x[[:xdigit:]]+$/); + $_ = ; + if (/returned from EXIM_DBOPEN(_MULTI)?: \(nil\)$/); + next; + } + if (/EXIM_DBCLOSE(_MULTI)?/) { ; next; } + next if /retaining retry hintsdb handle$/; + next if /using cached retry hintsdb (?:handle|nonpresence)$/; + if (/final close of cached retry db$/) { ; ; 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 )/; @@ -1170,7 +1234,7 @@ RESET_AFTER_EXTRA_LINE_READ: # 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]+$/; @@ -1230,13 +1294,19 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^TLS: not preloading server certs$/; # some platforms are missing the standard CA bundle file - next if /^tls_set_watch\(\) fail on '\/usr\/lib\/ssl\/cert.pem': No such file or directory$/; + 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:/; @@ -1245,11 +1315,14 @@ RESET_AFTER_EXTRA_LINE_READ: # different libraries will have different numbers (possibly 0) of follow-up # lines, indenting with more data if (/^$time_pid?Library version:/) { - while (1) { + $_ = ; + if (/^$time_pid?\s/) { $_ = ; - next if /^$time_pid?\s/; - goto RESET_AFTER_EXTRA_LINE_READ; + if (/^$time_pid?\s/) { + $_ = ; + } } + goto RESET_AFTER_EXTRA_LINE_READ; } # drop other build-time controls emitted for debugging @@ -1280,8 +1353,9 @@ RESET_AFTER_EXTRA_LINE_READ: if (/looked up these IP addresses/); next if /name=localhost address=::1/; - # drop pdkim debugging header + # DKIM: Not all builds include next if /^DKIM( <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+|: no signatures)$/; + next if /try option acl_smtp_dkim$/; # Some platforms have TIOCOUT, some do not next if /\d+ bytes remain in socket output buffer$/; @@ -1290,10 +1364,19 @@ RESET_AFTER_EXTRA_LINE_READ: next if /using host_fake_gethostbyname for \S+ \(IPv6\)/; next if /get\[host\|ipnode\]byname\[2\]\(af=inet6\)/; next if /DNS lookup of \S+ \(AAAA\) using fakens/; - next if / in dns_ipv4_lookup?/; next if / writing neg-cache entry for .*AAAA/; - next if /^faking res_search\(AAAA\) response length as 65535/; + next if /^ *faking res_search\(AAAA\) response length as 65535/; + if (/ in dns_ipv4_lookup\?$/) + { + $_= ; + if (/ list element: \*$/) + { + $_= ; + next if / in dns_ipv4_lookup\? yes \(matched "\*"\)/; + } + goto RESET_AFTER_EXTRA_LINE_READ; + } if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/) { $_= ; # Gets "returning DNS_NODATA" @@ -1320,6 +1403,10 @@ RESET_AFTER_EXTRA_LINE_READ: next if /in\s(?:tls_advertise_hosts\?|hosts_require_tls\?) \sno\s\((option\sunset|end\sof\slist)\)/x; + # non-TLS builds cannot have DANE + + next if /lack of DNSSEC traceability precludes DANE$/; + # Skip auxiliary group lists because they will vary. next if /auxiliary group list:/; @@ -1339,19 +1426,6 @@ RESET_AFTER_EXTRA_LINE_READ: 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\)/) - { - $_ .= ; - s?\Q$parm_cwd\E?TESTSUITE?g; - if (/TESTSUITE\/spool\/db\/\S+ appears not to exist: trying to create/) - { $_ = ; 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. @@ -1375,7 +1449,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/unexpected disconnection while reading SMTP command from \[127.0.0.1\] \K\(error: Connection reset by peer\) //; # Platform-dependent resolver option bits - s/^ (?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/; + s/(?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/; # timing variance, run-to-run s/^time on queue = \K1s/0s/; @@ -1401,17 +1475,32 @@ RESET_AFTER_EXTRA_LINE_READ: } # 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%(?; ; ; ; ; 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 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$/; @@ -1500,25 +1587,22 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/; s/^(sending) \d+ (nonTFO early-data)$/$1 dd $2/; - if (/^([0-9: ]* # possible timestamp - Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\. + if (/^[0-9: ]* # possible timestamp \ .*TFO\ mode\x20 (sendto,\ no\ data:\ EINPROGRESS # Linux |connection\ attempt\ to\ [^,]+,\ 0\ data) # MacOS & no-support $/x) { - $_ = $1 . " ... " . ; - s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/; - - if (/^Connecting to .* \.\.\. connected$/) + $_ = ; + if (/^connected$/) { $_ .= ; - if (/^(Connecting to .* \.\.\. )connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/) + if (/^connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/) { - $_ = $1 . "failed: Connection refused\n" . ; - s/^(Connecting .*)\n\s+SMTP\(close\)>>$/$1/; + $_ = "failed: Connection refused\n" . ; + s/^\n\s+SMTP\(close\)>>$/$1/; } - elsif (/^(Connecting to .* \.\.\. connected\n)read response data: size=/) + elsif (/^(connected\n)read response data: size=/) { $_ = $1; } # Date/time in SMTP banner @@ -1528,8 +1612,8 @@ RESET_AFTER_EXTRA_LINE_READ: } # 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/; @@ -2088,7 +2172,7 @@ $munges = 'timeout_errno' => # actual errno differs Solaris vs. Linux { 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 /' }, - 'peer_terminated_conn' => # actual error differs FreedBSD vs. Linux + 'peer_terminated_conn' => # actual error differs FreedBS/Solaris vs. Linux { 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' }, 'perl_variants' => # result of hash-in-scalar-context changed from bucket-fill to keycount @@ -2439,7 +2523,7 @@ if ($debug) { printf ">> $_\n"; } ################### # The "dbmbuild" command runs exim_dbmbuild. This is used both to test the -# utility and to make DBM files for testing DBM lookups. +# utility and to make hintsdb files for testing hintsdb lookups. if (/^dbmbuild\s+(\S+)\s+(\S+)/) { @@ -2452,7 +2536,7 @@ if (/^dbmbuild\s+(\S+)\s+(\S+)/) # The "dump" command runs exim_dumpdb. On different systems, the output for # some types of dump may appear in a different order because it's just hauled -# out of the DBM file. We can solve this by sorting. Ignore the leading +# out of the hintsdb file. We can solve this by sorting. Ignore the leading # date/time, as it will be flattened later during munging. if (/^dump\s+(\S+)/) @@ -3347,7 +3431,7 @@ if (defined $parm_lookups{redis}) sub check_running_dovecot { -system('dovecot --version >/dev/null'); +system('dovecot --version >/dev/null 2>&1'); if ($? == 0) { print "Dovecot appears to be available\n"; @@ -3648,48 +3732,53 @@ while () } elsif (/^Support for: (.*)/) - { + { # Compile-time features - exim -bV print; @temp = split /(\s+)/, $1; push(@temp, ' '); %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 =~ "/") @@ -4059,6 +4148,16 @@ system("sudo cp eximdir/exim eximdir/exim_exim;" . "sudo chgrp $parm_eximgroup eximdir/exim_exim;" . "sudo chmod 06755 eximdir/exim_exim"); +# Copy any libraries that were built for dynamic load + +($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 # ################################################## @@ -4066,8 +4165,6 @@ system("sudo cp eximdir/exim eximdir/exim_exim;" . # 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")) { @@ -4215,7 +4312,7 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++) if (!defined $parm_malware{$1}) { $wantthis = 0; last; } } elsif (/^(not )?feature (.*)$/) - { + { #a macro name, or lack thereof - -bP macros # move to a subroutine? my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $2"; @@ -4333,6 +4430,9 @@ foreach $basedir ("aux-var", "dnszones") $" = ' '; } + 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: $!"); @@ -4340,7 +4440,7 @@ foreach $basedir ("aux-var", "dnszones") tests_exit(-1, "Failed to open $parm_cwd/$basedir/$outfile: $!"); while () { - do_substitute(0); + do_substitute($testnum); print OUT; } close(IN); @@ -4539,6 +4639,7 @@ foreach $test (@test_list) $next_msgid = "aX"; $next_pid = 1234; $next_port = 1111; + $next_conn = 1111; $message_skip = 0; $msglog_skip = 0; $munge_skip = 0;