Gitweb:
https://git.exim.org/exim.git/commitdiff/4a73f047f3ee48a7156cd6007da8d2dfc21f85a9
Commit: 4a73f047f3ee48a7156cd6007da8d2dfc21f85a9
Parent: 5bccccc70f6564afdc6fa0c64dafd0a073dfa451
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Oct 30 13:05:55 2022 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Thu Nov 3 22:53:01 2022 +0000
Testsuite: fix munge of timestamp with timezone name
---
test/runtest | 2 +-
test/stderr/2620 | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/runtest b/test/runtest
index df68ecd9b..3cc534c98 100755
--- a/test/runtest
+++ b/test/runtest
@@ -507,7 +507,7 @@ RESET_AFTER_EXTRA_LINE_READ:
# Date/time in logs and in one instance of a filter test
s/^\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d(\s[+-]\d\d\d\d)?\s/1999-03-02 09:44:33 /gx;
- s/^\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\.\d{3}(\s[+-]\d\d\d\d)?\s/2017-07-30 18:51:05.712 /gx;
+ s/^\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\.\d{3}(?:\s(?:[+-]\d\d\d\d|[A-Z]{2}T))?\s/2017-07-30 18:51:05.712 /gx;
s/^Logwrite\s"\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Logwrite "1999-03-02 09:44:33/gx;
# Date/time in syslog test
s/^SYSLOG:\s\'\K\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\s/2017-07-30 18:51:05 /gx;
diff --git a/test/stderr/2620 b/test/stderr/2620
index 9f68b79d7..04646f15d 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -804,5 +804,5 @@ close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER
>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
-2017-07-30 18:51:05.712 BST [pppp] LOG: redirecting log output to logging collector process
-2017-07-30 18:51:05.712 BST [pppp] HINT: Future log output will appear in directory "log".
+2017-07-30 18:51:05.712 [pppp] LOG: redirecting log output to logging collector process
+2017-07-30 18:51:05.712 [pppp] HINT: Future log output will appear in directory "log".
