Fix merge issues, remove excess files - match perl-5.28.1 dist

looking good sthen@, Great! bluhm@

1 files changed, 3 insertions, 3 deletions

diff --git a/gnu/usr.bin/perl/t/uni/variables.t b/gnu/usr.bin/perl/t/uni/variables.t
index 5601b9767f2..a1f7cc2d008 100644
--- a/gnu/usr.bin/perl/t/uni/variables.t
+++ b/gnu/usr.bin/perl/t/uni/variables.t
@@ -106,7 +106,7 @@ for ( 0x0 .. 0xff ) {
         else {
             $name = sprintf "\\x%02x, a C1 control", $ord;
         }
-        $syntax_error = $::IS_EBCDIC;
+        $syntax_error = 1;
         $deprecated = ! $syntax_error;
     }
     elsif ($chr =~ /\p{XIDStart}/) {
@@ -114,7 +114,7 @@ for ( 0x0 .. 0xff ) {
     }
     elsif ($chr =~ /\p{XPosixSpace}/) {
         $name = sprintf "\\x%02x, a non-ASCII space character", $ord;
-        $syntax_error = $::IS_EBCDIC;
+        $syntax_error = 1;
         $deprecated = ! $syntax_error;
     }
     else {
@@ -130,7 +130,7 @@ for ( 0x0 .. 0xff ) {
                      "$name as a length-1 variable generates a syntax error");
             $tests++;
             utf8::upgrade($chr);
-            evalbytes "no strict; use utf8; \$$chr = 4;",
+            eval "no strict; \$$chr = 4;",
             like($@, qr/ syntax\ error | Unrecognized\ character /x,
                      "  ... and the same under 'use utf8'");
             $tests++;