From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 16 Dec 2005 15:55:51 +0000 (+0000)
Subject: comp/require.t exits early for the case of UTF-8 or EBCDIC, so need to
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2d6f15eafc21a67bcb6eacef80e82c8f616ab7c1;p=p5sagit%2Fp5-mst-13.2.git

comp/require.t exits early for the case of UTF-8 or EBCDIC, so need to
add "new" tests before the end.

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

diff --git a/t/comp/require.t b/t/comp/require.t
index 6dfa14e..1e2c9fb 100755
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -179,6 +179,20 @@ $foo = eval  {require bleah}; delete $INC{"bleah.pm"}; ++$::i;
 @foo = eval  {require bleah}; delete $INC{"bleah.pm"}; ++$::i;
        eval  {require bleah};
 
+# Test for fix of RT #24404 : "require $scalar" may load a directory
+my $r = "threads";
+eval { require $r };
+$i++;
+if($@ =~ /Directory .*threads not allowed in require/) {
+    print "ok $i\n";
+} else {
+    print "not ok $i\n";
+}
+
+############################
+#### Add new tests here ####
+############################
+
 # UTF-encoded things - skipped on EBCDIC machines and on UTF-8 input
 
 if ($Is_EBCDIC || $Is_UTF8) { exit; }
@@ -195,17 +209,6 @@ sub bytes_to_utf16 {
 $i++; do_require(bytes_to_utf16('n', qq(print "ok $i\\n"; 1;\n), 1)); # BE
 $i++; do_require(bytes_to_utf16('v', qq(print "ok $i\\n"; 1;\n), 1)); # LE
 
-# Test for fix of RT #24404 : "require $scalar" may load a directory
-my $r = "threads";
-eval { require $r };
-$i++;
-if($@ =~ /Directory .*threads not allowed in require/) {
-    print "ok $i\n";
-} else {
-    print "not ok $i\n";
-}
-
-
 END {
     1 while unlink 'bleah.pm';
     1 while unlink 'bleah.do';