prevent a couple of porting test issues under PERL_UNICODE

cmpVERSION.pl: get_file_from_git() was returning a character string
which was then passed to MM->parse_version(), implicitly using
PerlIO::scalar to parse the content.

test_bootstrap.t complains since some of the test files aren't valid
UTF-8.

diff --git a/Porting/cmpVERSION.pl b/Porting/cmpVERSION.pl
index 525ffe1..5300b87 100755 (executable)
--- a/Porting/cmpVERSION.pl
+++ b/Porting/cmpVERSION.pl
@@ -192,6 +192,8 @@ foreach my $pm_file (sort keys %module_diffs) {
 sub get_file_from_git {
     my ($file, $tag) = @_;
     local $/;
+
+    use open IN => ':raw';
     return scalar `git --no-pager show $tag:$file 2>$null`;
 }
 

diff --git a/t/porting/test_bootstrap.t b/t/porting/test_bootstrap.t
index 654eaac..df10b4c 100644 (file)
--- a/t/porting/test_bootstrap.t
+++ b/t/porting/test_bootstrap.t
@@ -30,6 +30,8 @@ while (my $file = <$fh>) {
 
     local $/;
     open my $t, '<', $file or die "Can't open $file: $!";
+    # avoid PERL_UNICODE causing us to read non-UTF-8 files as UTF-8
+    binmode $t;
     my $contents = <$t>;
     # Make sure that we don't match ourselves
     unlike($contents, qr/use\s+Test::More/, "$file doesn't use Test::\QMore");