summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-02-10 20:25:59 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2019-02-11 00:17:44 +0000
commitefc8902f16c92a74d06870f2556cb36c84dd4d93 (patch)
treeb666d2d196548cebba47b0c6584e948a5fc7a23a /test
parent95f52235555fa6b887d34b8d8817af3c9ab38273 (diff)
Testsuite: account for (now) properly working Perl locale
Diffstat (limited to 'test')
-rwxr-xr-xtest/runtest3
-rw-r--r--test/scripts/3000-Perl/30001
-rw-r--r--test/stdout/30003
3 files changed, 6 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest
index 729f88a66..d52facc7a 100755
--- a/test/runtest
+++ b/test/runtest
@@ -494,6 +494,9 @@ RESET_AFTER_EXTRA_LINE_READ:
# Date/time in header lines and SMTP responses
s/[A-Z][a-z]{2},\s\d\d?\s[A-Z][a-z]{2}\s\d\d\d\d\s\d\d\:\d\d:\d\d\s[-+]\d{4}
/Tue, 2 Mar 1999 09:44:33 +0000/gx;
+ # and in a French locale
+ s/\S{4},\s\d\d?\s[^,]+\s\d\d\d\d\s\d\d\:\d\d:\d\d\s[-+]\d{4}
+ /dim., 10 f\xE9vr 2019 20:05:49 +0000/gx;
# 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;
diff --git a/test/scripts/3000-Perl/3000 b/test/scripts/3000-Perl/3000
index 60db492ad..c3c01115b 100644
--- a/test/scripts/3000-Perl/3000
+++ b/test/scripts/3000-Perl/3000
@@ -19,6 +19,7 @@ ${perl{return_list}}
${perl{return_variable_vector}}
${sg{${perl{return_hash}}}{\\d+}{X}}
+this change-locale fails in earlier systems. Works on Fedora 29.
$tod_full // ${perl{change_locale}} // $tod_full
****
exim -d-all+expand -be
diff --git a/test/stdout/3000 b/test/stdout/3000
index 50be468c2..9613d0e45 100644
--- a/test/stdout/3000
+++ b/test/stdout/3000
@@ -19,7 +19,8 @@
> 3
> X
>
-> Tue, 2 Mar 1999 09:44:33 +0000 // Changed locale // Tue, 2 Mar 1999 09:44:33 +0000
+> this change-locale fails in earlier systems. Works on Fedora 29.
+> Tue, 2 Mar 1999 09:44:33 +0000 // Changed locale // dim., 10 févr 2019 20:05:49 +0000
>
> Subroutine foo called with args: arg1
> Failed: Perl subroutine "foo_undef" returned undef to force failure