Testsuite: munge for more platform variabilities

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 6cc5b3bdb07298a1af44f4448f6f1cc0e2b679a1..10f5e441582d1f844fa68ae68acf0d5c27f3e880 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1120,7 +1120,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^Lookups \(built-in\):/;
     next if /^Loading lookup modules from/;
     next if /^Loaded \d+ lookup modules/;
-    next if /^Total \d+ lookups/;
+    next if /^(?:\d\d:\d\d:\d\d \d+ )?Total \d+ lookups/;
 
     # drop compiler information
     next if /^Compiler:/;
@@ -1408,8 +1408,13 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/^errno = \d+$/errno = EEE/;
     s/^writing error \d+: /writing error EEE: /;
 
-    # Some platforms have to flip to slow-mode taint-checking
-    next if /switching to slow-mode taint checking/;
+    # Time-only, in debug output
+    # we have to handle double lines from the DBOPEN, hence placed down here and /mg
+    s/^\d\d:\d\d:\d\d\s/01:01:01 /mg;
+
+    # pid in debug lines
+    s/^(\d\d:\d\d:\d\d)(\s\d+\s)/"$1 " . new_value($2, "%s", \$next_pid) . " "/mgxe;
+    s/(?<!post-)[Pp]rocess\K(\s\d+ )/new_value($1, "%s", \$next_pid) . " "/gxe;
 
     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
@@ -1444,7 +1449,7 @@ RESET_AFTER_EXTRA_LINE_READ:
                 /^Routers:/ ||
                 /^Transports:/ ||
                 /^Malware:/ ||
-                /^log selectors =/ ||
+                /^(?:\d\d:\d\d:\d\d \d+ )?log selectors =/ ||
                 /^cwd=/ ||
                 /^Fixed never_users:/ ||
                /^Configure owner:/ ||