X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fruntest;h=aeb0d8f53eab91ee7fb293371db80bd913c5f31f;hb=1935b47f7c6dfadfb9146b220a62c037b0f4f75c;hp=e914ccb563e8f929e07d6dc767d9a573ed0eb1e0;hpb=84a655513611641b55a8f46c13ee0e3cb141477f;p=exim.git

diff --git a/test/runtest b/test/runtest
index e914ccb56..aeb0d8f53 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1210,13 +1210,17 @@ RESET_AFTER_EXTRA_LINE_READ:
     # timing variance, run-to-run
     s/^time on queue = \K1s/0s/;
 
+    # content-scan: file order can vary in directory
+    s%unspool_mbox\(\): unlinking 'TESTSUITE/spool/scan/[^/]*/\K[^\']*%FFFFFFFFF%;
+
     # Skip hosts_require_dane checks when the options
     # are unset, because dane ain't always there.
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
 
     # daemon notifier socket
-    s/^(creating notifier socket) .*$/$1/;
-    s/^(\s*\d+|ppppp) (creating notifier socket) .+$/ppppp $2/;
+    s/^(\s*\d+|ppppp) (creating notifier socket)$/ppppp $2/;
+    s/^ \@(.*exim_daemon_notify)$/ $1/;
+    s/^(\s*\d+|ppppp)  \@(.*exim_daemon_notify)$/ppppp  $2/;
     next if /unlinking notifier socket/;
 
     # DISABLE_OCSP