From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Thu, 28 Mar 2002 15:52:30 +0000 (+0000)
Subject: If expecting UTF-8, probably not expecting UTF-16.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8a22007576b03a2f42861e49c20ebb363ff4ba58;p=p5sagit%2Fp5-mst-13.2.git

If expecting UTF-8, probably not expecting UTF-16.

p4raw-id: //depot/perl@15584
---

diff --git a/t/comp/require.t b/t/comp/require.t
index ea4b96d..44b46cd 100755
--- 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 {
@@ -129,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);