Testsuite: make "client" util TLS variants more similar

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

diff --git a/test/runtest b/test/runtest
index ffa0a7112973c3bb5c6ba5ede43fe128b975fa2c..3f37311b18032f2c5df87d94974c218913400efd 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1029,6 +1029,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # TLS resumption is not always supported by the build
     next if /^tls_resumption_hosts =/;
     next if /^-tls_resumption/;
     # TLS resumption is not always supported by the build
     next if /^tls_resumption_hosts =/;
     next if /^-tls_resumption/;

+
+    # gsasl library version may not support some methods
+    s/250-AUTH ANONYMOUS PLAIN SCRAM-SHA-1\K SCRAM-SHA-256//;

     }
 
   # ======== stderr ========
     }
 
   # ======== stderr ========


@@ -1207,13 +1210,17 @@ RESET_AFTER_EXTRA_LINE_READ:
     # timing variance, run-to-run
     s/^time on queue = \K1s/0s/;
 
     # 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
     # 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
     next if /unlinking notifier socket/;
 
     # DISABLE_OCSP