[exim-cvs] Testsuite: account for (now) properly working Per…

Inizio della pagina
Delete this message
Reply to this message
Autore: Exim Git Commits Mailing List
Data:  
To: exim-cvs
Oggetto: [exim-cvs] Testsuite: account for (now) properly working Perl locale
Gitweb: https://git.exim.org/exim.git/commitdiff/f5b77e4bba2214d10072926d6de470cb8b38c626
Commit:     f5b77e4bba2214d10072926d6de470cb8b38c626
Parent:     806db4f5016cd54177138fe1234b5dfa450d9c49
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Feb 10 20:25:59 2019 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Feb 10 20:25:59 2019 +0000


    Testsuite: account for (now) properly working Perl locale
---
 test/runtest                | 3 +++
 test/scripts/3000-Perl/3000 | 1 +
 test/stdout/3000            | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)


diff --git a/test/runtest b/test/runtest
index b0fb96b..d76b253 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 60db492..c3c0111 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 50be468..9613d0e 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