Default notifier socket name to spooldir-dependent path even for abstract names

[users/heiko/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 994ff9ff884c6cc615db23db315ea960cd5d4db2..aeb0d8f53eab91ee7fb293371db80bd913c5f31f 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1218,8 +1218,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
 
     # daemon notifier socket
     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
     next if /unlinking notifier socket/;
 
     # DISABLE_OCSP