Fix and test for [perl #15549 Empty \Q\E not permitted]

[p5sagit/p5-mst-13.2.git] / t / comp / require.t

diff --git a/t/comp/require.t b/t/comp/require.t
index 0741561..44b46cd 100755 (executable)
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -10,8 +10,9 @@ BEGIN {
 $i = 1;
 
 my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
+my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;
 my $total_tests = 23;
-if ($Is_EBCDIC) { $total_tests = 20; }
+if ($Is_EBCDIC || $Is_UTF8) { $total_tests = 20; }
 print "1..$total_tests\n";
 
 sub do_require {
@@ -27,7 +28,7 @@ sub write_file {
     binmode REQ;
     use bytes;
     print REQ @_;
-    close REQ;
+    close REQ or die "Could not close $f: $!";
 }
 
 eval {require 5.005};
@@ -86,7 +87,6 @@ print "not " unless 5.5.1 gt v5.5;
 print "ok ",$i++,"\n";
 
 {
-    use utf8;
     print "not " unless v5.5.640 eq "\x{5}\x{5}\x{280}";
     print "ok ",$i++,"\n";
 
@@ -130,9 +130,9 @@ dofile();
 sub dofile { do "bleah.do"; };
 print $x;
 
-# UTF-encoded things - skipped on EBCDIC machines
+# UTF-encoded things - skipped on EBCDIC machines and on UTF-8 input
 
-if ($Is_EBCDIC) { exit; }
+if ($Is_EBCDIC || $Is_UTF8) { exit; }
 
 my $utf8 = chr(0xFEFF);