my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
my $Is_UTF8 = (${^OPEN} || "") =~ /:utf8/;
-my $total_tests = 45;
-if ($Is_EBCDIC || $Is_UTF8) { $total_tests = 42; }
+my $total_tests = 46;
+if ($Is_EBCDIC || $Is_UTF8) { $total_tests -= 3; }
print "1..$total_tests\n";
sub do_require {
@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($@ =~ /Can't locate threads in \@INC/) {
+ print "ok $i\n";
+} else {
+ print "not ok $i\n";
+}
+
+
+write_file('bleah.pm', qq(die "This is an expected error";\n));
+delete $INC{"bleah.pm"}; ++$::i;
+eval { CORE::require bleah; };
+if ($@ =~ /^This is an expected error/) {
+ print "ok $i\n";
+} else {
+ print "not ok $i\n";
+}
+
+##########################################
+# What follows are UTF-8 specific tests. #
+# Add generic tests before this point. #
+##########################################
+
# UTF-encoded things - skipped on EBCDIC machines and on UTF-8 input
if ($Is_EBCDIC || $Is_UTF8) { exit; }
$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';