Testsuite: account for (now) properly working Perl locale

(cherry picked from commit efc8902f16c92a74d06870f2556cb36c84dd4d93)
(cherry picked from commit ec8db648d3af8af2d9e6cbd4896159235c0f1e49)

diff --git a/test/runtest b/test/runtest
index 3f7e106273931d439471a67d1be7fd1fee96eb11..337ff27c66ca9849a3ee37e95c5939fd8d9324f0 100755 (executable)
--- 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;
   # 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;
 
   # 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 60db492ad328c1c419679ebdda39688146cf8aa4..c3c01115b2da1dc4232088bdfd55e5f3b185feb4 100644 (file)
--- 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}}
 
 ${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
 $tod_full // ${perl{change_locale}} // $tod_full
 ****
 exim -d-all+expand -be

diff --git a/test/stdout/3000 b/test/stdout/3000
index 50be468c24ef251885c1459b5685d726ef2d311a..9613d0e4506df853d784cf7b4d6f8ccd77044f14 100644 (file)
--- a/test/stdout/3000
+++ b/test/stdout/3000
@@ -19,7 +19,8 @@
 > 3
 > X
 > 
 > 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
 > 
 > Subroutine foo called with args: arg1
 > Failed: Perl subroutine "foo_undef" returned undef to force failure