Testsuite: fix perl syntax. Bug 3009

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index bc570842a91bdbe5b1313a128b3137fb4b359c86..e918b0cdf0abb209ad1580c46982441a1421c1cd 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -891,7 +891,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   s/([\s,])S=\d+\b/$1S=sss/;
   s/:S\d+\b/:Ssss/;
-  s/^(\s*\d+[mhd]\s+)\d+(\s+[a-z0-9-]{23} <)/TTT   sss$2/i if $is_stdout;
+  s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[a-z0-9-]{23}|[a-z0-9-]{18}) <)/TTT   sss$2/i if $is_stdout;
   s/\sSIZE=\d+\b/ SIZE=ssss/;
   s/\ssize=\d+\b/ size=sss/ if $is_stderr;
   s/old size = \d+\b/old size = sssss/;
@@ -1071,8 +1071,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/250-AUTH ANONYMOUS PLAIN SCRAM-SHA-1\K SCRAM-SHA-256//;
 
     # mailq times change with when the run is done, vs. static-source spoolfiles
-    #s/\s*\d*[hd](?=   317 [0-9A-Za-z\-]{23} <nobody@test.ex>)/DDd/;
-    s/^\s*\d*[hd](?=   317 [0-9A-Za-z\-]{23} <nobody@test.)/DDd/;
+    s/\s*\d*[hd](?=   317 [0-9A-Za-z\-]{23} <nobody\@test.ex>)/DDd/;
     }
 
   # ======== stderr ========