diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-02-10 20:25:59 +0000 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2019-07-19 08:55:05 +0200 |
| commit | a8761d62664f96259d815ab84a7a734829972fb3 (patch) | |
| tree | f60d1ed1c01f5b5028bb0c61fa3f1b2ffda6a6ee | |
| parent | b88b6f6f3a29b70cd0b314da8ceab18b0b34eed6 (diff) | |
| download | exim4-a8761d62664f96259d815ab84a7a734829972fb3.tar.gz | |
Testsuite: account for (now) properly working Perl locale
(cherry picked from commit efc8902f16c92a74d06870f2556cb36c84dd4d93)
(cherry picked from commit ec8db648d3af8af2d9e6cbd4896159235c0f1e49)
| -rwxr-xr-x | test/runtest | 3 | ||||
| -rw-r--r-- | test/scripts/3000-Perl/3000 | 1 | ||||
| -rw-r--r-- | test/stdout/3000 | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest index 3f7e10627..337ff27c6 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 |