Testsuite: platform variations

diff --git a/test/runtest b/test/runtest
index 3da23b945ea1179d38f0d4f44f9e50a151ca6590..3a9a68c51327a41ab4b993ff2dcc0933d99de3a0 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1319,9 +1319,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
 
     # daemon notifier socket
-    s/^(\s*\d+|ppppp) (creating notifier socket)$/ppppp $2/;
-    s/^ \@(.*exim_daemon_notify)$/ $1/;
-    s/^(\s*\d+|ppppp)  \@?(.*exim_daemon_notify)$/ppppp  $2/;
+    s% \@(?=[^ @]+/spool/exim_daemon_notify$)% %;
     next if /unlinking notifier socket/;
 
     # daemon notifier socket

diff --git a/test/stderr/0433 b/test/stderr/0433
index da7d5933d66f8bc78be87bfd505f0f613e07530b..40eef044c407c1e43d9fc7aa0d22df53d21403d6 100644 (file)
--- a/test/stderr/0433
+++ b/test/stderr/0433
@@ -8,7 +8,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1234 creating notifier socket
-p1234  @TESTSUITE/spool/exim_daemon_notify
+p1234  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port PORT_D
 pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon
@@ -30,7 +30,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1235 creating notifier socket
-p1235  @TESTSUITE/spool/exim_daemon_notify
+p1235  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port PORT_D
 listening on all interfaces (IPv4) port PORT_D2
 pid written to TESTSUITE/spool/exim-daemon.pid
@@ -53,7 +53,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1236 creating notifier socket
-p1236  @TESTSUITE/spool/exim_daemon_notify
+p1236  TESTSUITE/spool/exim_daemon_notify
 listening on 127.0.0.1 port PORT_D4
 listening on all interfaces (IPv4) port PORT_D
 listening on all interfaces (IPv4) port PORT_D2
@@ -77,7 +77,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1237 creating notifier socket
-p1237  @TESTSUITE/spool/exim_daemon_notify
+p1237  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port PORT_D
 listening on all interfaces (IPv4) port PORT_D2
 listening on 127.0.0.1 port PORT_D4

diff --git a/test/stderr/1007 b/test/stderr/1007
index ceb19161bb81d29f9c0eb111f15b9543ead83434..ca46d25e6580cf9bc709cb45facfd587a28ad118 100644 (file)
--- a/test/stderr/1007
+++ b/test/stderr/1007
@@ -8,7 +8,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1234 creating notifier socket
-p1234  @TESTSUITE/spool/exim_daemon_notify
+p1234  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port PORT_D
 listening on all interfaces (IPv4) port PORT_D
 pid written to TESTSUITE/spool/exim-daemon.pid
@@ -31,7 +31,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1235 creating notifier socket
-p1235  @TESTSUITE/spool/exim_daemon_notify
+p1235  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port PORT_D
 listening on all interfaces (IPv4) port PORT_D
 listening on all interfaces (IPv6) port PORT_D2
@@ -56,7 +56,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1236 creating notifier socket
-p1236  @TESTSUITE/spool/exim_daemon_notify
+p1236  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port PORT_D
 listening on all interfaces (IPv4) port PORT_D
 listening on all interfaces (IPv6) port PORT_D2
@@ -82,7 +82,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1237 creating notifier socket
-p1237  @TESTSUITE/spool/exim_daemon_notify
+p1237  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port PORT_D
 listening on all interfaces (IPv4) port PORT_D
 listening on all interfaces (IPv6) port PORT_D2
@@ -108,7 +108,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 p1238 creating notifier socket
-p1238  @TESTSUITE/spool/exim_daemon_notify
+p1238  TESTSUITE/spool/exim_daemon_notify
 listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port PORT_D
 listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port PORT_D2
 pid written to TESTSUITE/spool/exim-daemon.pid