Docs: subsections

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index e806244848ab6ae7d91994b056f715f931c9d48f..ae227810cbb24c07af5bbbdf1cab6a3e6a4006c9 100755 (executable)
--- 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
 
 
 # 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.
 
 # 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 /^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
 
     # 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:/) {
     # 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>;
        $_ = <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
     }
 
     # drop other build-time controls emitted for debugging


@@ -1555,8 +1559,10 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^DKIM >> Body data for hash, canonicalized/;
 
     # Not all platforms build with SPF 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 /try option spf_smtp_comment_template$/;

+    next if /loading module '(?:dmarc|spf)'$/;
+    next if /^$time_pid?Loaded "(?:dmarc|spf)"$/;

 
     # Not all platforms have sendfile support
     next if /^cannot use sendfile for body: no support$/;
 
     # Not all platforms have sendfile support
     next if /^cannot use sendfile for body: no support$/;