X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ac8aeb5485a80a06ac8a52b43b84210564cd7e09..db1d45ff1e5f3d83d24e75400a157d5fbc86d1c7:/test/runtest diff --git a/test/runtest b/test/runtest index e80624484..83659ea19 100755 --- a/test/runtest +++ b/test/runtest @@ -383,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. @@ -1297,11 +1297,12 @@ RESET_AFTER_EXTRA_LINE_READ: 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 @@ -1314,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) { + $_ = <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 @@ -1471,7 +1475,6 @@ RESET_AFTER_EXTRA_LINE_READ: } # Different builds will have different lookup types included - 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%; @@ -1555,8 +1558,10 @@ RESET_AFTER_EXTRA_LINE_READ: 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 '(?:dkim|dmarc|spf)'$/; + next if /^$time_pid?Loaded "(?:dkim|dmarc|spf)"$/; # Not all platforms have sendfile support next if /^cannot use sendfile for body: no support$/; @@ -4142,7 +4147,6 @@ system("sudo cp eximdir/exim 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?;