comp/require.t exits early for the case of UTF-8 or EBCDIC, so need to

[perl5.git] / t / comp / require.t

diff --git a/t/comp/require.t b/t/comp/require.t
index fa75e18..1e2c9fb 100755 (executable)
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -11,8 +11,8 @@ $i = 1;
 
 my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
 my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;
 
 my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
 my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;

-my $total_tests = 44;
-if ($Is_EBCDIC || $Is_UTF8) { $total_tests = 27; }
+my $total_tests = 45;
+if ($Is_EBCDIC || $Is_UTF8) { $total_tests = 42; }

 print "1..$total_tests\n";
 
 sub do_require {
 print "1..$total_tests\n";
 
 sub do_require {


@@ -75,7 +75,7 @@ print "ok ",$i++,"\n";
 # check inaccurate fp
 $ver = 10.2;
 eval { require $ver; };
 # check inaccurate fp
 $ver = 10.2;
 eval { require $ver; };

-print "# $@\nnot " unless $@ =~ /^Perl v10\.200\.0 required/;
+print "# $@\nnot " unless $@ =~ /^Perl v10\.200.0 required/;

 print "ok ",$i++,"\n";
 
 $ver = 10.000_02;
 print "ok ",$i++,"\n";
 
 $ver = 10.000_02;


@@ -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};
 
 @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; }
 # UTF-encoded things - skipped on EBCDIC machines and on UTF-8 input
 
 if ($Is_EBCDIC || $Is_UTF8) { exit; }