In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/5ceaabe8e4e93dd375a9f43ffc52956b89ed492d?hp=4ffbb0c46e27652ffde1eadeda1809a0338fa182>
- Log ----------------------------------------------------------------- commit 5ceaabe8e4e93dd375a9f43ffc52956b89ed492d Author: Steve Hay <[email protected]> Date: Sat Aug 4 14:01:27 2012 +0100 Remove CR characters from raw input in op/magic.t on Windows The :raw input added by e2e1d5ce8b broke tests on Windows by introducing unexpeted CR characters. Two tests (154 and 157) currently still fail on Windows if the (DOS) command prompt is using a different code page to perl's native (Windows) character set. ----------------------------------------------------------------------- Summary of changes: t/op/magic.t | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/t/op/magic.t b/t/op/magic.t index 3a620aa..ebf99a7 100644 --- a/t/op/magic.t +++ b/t/op/magic.t @@ -70,7 +70,8 @@ sub env_is { if ($Is_MSWin32) { # cmd.exe will echo 'variable=value' but 4nt will echo just the value # -- Nikola Knezevic - like `set $key`, qr/^(?:\Q$key\E=)?\Q$val\E$/, $desc; + (my $set = `set $key`) =~ s/\r\n$/\n/; + like $set, qr/^(?:\Q$key\E=)?\Q$val\E$/, $desc; } elsif ($Is_VMS) { is `write sys\$output f\$trnlnm("\Q$key\E")`, "$val\n", $desc; } else { -- Perl5 Master Repository
