In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/f670c2bb3dd57802df85a5c454bf77c8a891846e?hp=23155e743c754ba1a72bdfc864ceaeaf7ce2448f>
- Log ----------------------------------------------------------------- commit f670c2bb3dd57802df85a5c454bf77c8a891846e Author: Tony Cook <[email protected]> Date: Tue Jul 23 10:45:04 2019 +1000 avoid synthesizing locale names with newlines in them while debugging some strange behaviour on Win32 I tried dumping locale names in _trylocale() and saw names go past like: sv_fi.15 <-- newline added at the end sv_fi.15 .UTF-8 sv_fi.15 .65001 sv_fi.15 .ACP sv_fi.15 .OCP sv_fi.15 .1252 commit 43e5ab2e34fe55efd182c925309a4cf5ff2ec540 Author: Tony Cook <[email protected]> Date: Tue Jul 23 09:55:05 2019 +1000 Win32: set FOO lists values for all variables starting with FOO I'd been testing setting FOOBAR to Unicode values, so this test was failing due to the extra variable. ----------------------------------------------------------------------- Summary of changes: t/loc_tools.pl | 1 + t/op/magic.t | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/t/loc_tools.pl b/t/loc_tools.pl index beebd98d88..86d694d09d 100644 --- a/t/loc_tools.pl +++ b/t/loc_tools.pl @@ -424,6 +424,7 @@ sub find_locales ($;$) { push @Data, <DATA>; close DATA; foreach my $line (@Data) { + chomp $line; my ($locale_name, $language_codes, $country_codes, $encodings) = split /:/, $line; _my_diag(__FILE__ . ":" . __LINE__ . ": Unexpected syntax in '$line'") diff --git a/t/op/magic.t b/t/op/magic.t index 27c1d43da0..2a7a627d86 100644 --- a/t/op/magic.t +++ b/t/op/magic.t @@ -104,7 +104,7 @@ END { eval '$ENV{"FOO"} = "hi there";'; # check that ENV is inited inside eval # cmd.exe will echo 'variable=value' but 4nt will echo just the value # -- Nikola Knezevic -if ($Is_MSWin32) { like `set FOO`, qr/^(?:FOO=)?hi there$/; } +if ($Is_MSWin32) { like `set FOO`, qr/^(?:FOO=)?hi there$/m; } elsif ($Is_VMS) { is `write sys\$output f\$trnlnm("FOO")`, "hi there\n"; } else { is `echo \$FOO`, "hi there\n"; } -- Perl5 Master Repository
