X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcomp%2Frequire.t;h=d06834a3c56081382e27e5c0a5586ec255a5e370;hb=6b845e562be40aac749b544b6d494078c54de4aa;hp=e634532275f884c9867728b7c6be432bb1b63dc1;hpb=7d59b7e40bca518078f3e97c802950b76d52efa2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/comp/require.t b/t/comp/require.t
index e634532..d06834a 100755
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -8,7 +8,12 @@ BEGIN {
 
 # don't make this lexical
 $i = 1;
-print "1..23\n";
+
+my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
+my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;
+my $total_tests = 46;
+if ($Is_EBCDIC || $Is_UTF8) { $total_tests -= 3; }
+print "1..$total_tests\n";
 
 sub do_require {
     %INC = ();
@@ -23,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};
@@ -70,7 +75,7 @@ print "ok ",$i++,"\n";
 # 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;
@@ -82,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";
 
@@ -104,6 +108,24 @@ do_require "0;\n";
 print "# $@\nnot " unless $@ =~ /did not return a true/;
 print "ok ",$i++,"\n";
 
+print "not " if exists $INC{'bleah.pm'};
+print "ok ",$i++,"\n";
+
+my $flag_file = 'bleah.flg';
+# run-time error in require
+for my $expected_compile (1,0) {
+    write_file($flag_file, 1);
+    print "not " unless -e $flag_file;
+    print "ok ",$i++,"\n";
+    write_file('bleah.pm', "unlink '$flag_file' or die; \$a=0; \$b=1/\$a; 1;\n");
+    print "# $@\nnot " if eval { require 'bleah.pm' };
+    print "ok ",$i++,"\n";
+    print "not " unless -e $flag_file xor $expected_compile;
+    print "ok ",$i++,"\n";
+    print "not " unless exists $INC{'bleah.pm'};
+    print "ok ",$i++,"\n";
+}
+
 # compile-time failure in require
 do_require "1)\n";
 # bison says 'parse error' instead of 'syntax error',
@@ -111,6 +133,20 @@ do_require "1)\n";
 print "# $@\nnot " unless $@ =~ /(syntax|parse) error/mi;
 print "ok ",$i++,"\n";
 
+# previous failure cached in %INC
+print "not " unless exists $INC{'bleah.pm'};
+print "ok ",$i++,"\n";
+write_file($flag_file, 1);
+write_file('bleah.pm', "unlink '$flag_file'; 1");
+print "# $@\nnot " if eval { require 'bleah.pm' };
+print "ok ",$i++,"\n";
+print "# $@\nnot " unless $@ =~ /Compilation failed/i;
+print "ok ",$i++,"\n";
+print "not " unless -e $flag_file;
+print "ok ",$i++,"\n";
+print "not " unless exists $INC{'bleah.pm'};
+print "ok ",$i++,"\n";
+
 # successful require
 do_require "1";
 print "# $@\nnot " if $@;
@@ -126,7 +162,52 @@ dofile();
 sub dofile { do "bleah.do"; };
 print $x;
 
-# UTF-encoded things
+# Test that scalar context is forced for require
+
+write_file('bleah.pm', <<'**BLEAH**'
+print "not " if !defined wantarray || wantarray ne '';
+print "ok $i - require() context\n";
+1;
+**BLEAH**
+);
+                              delete $INC{"bleah.pm"}; ++$::i;
+$foo = eval q{require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+@foo = eval q{require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+       eval q{require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+       eval q{$_=$_+2;require bleah}; delete $INC{"bleah.pm"}; ++$::i;
+$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($@ =~ /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; }
+
 my $utf8 = chr(0xFEFF);
 
 $i++; do_require(qq(${utf8}print "ok $i\n"; 1;\n));
@@ -139,7 +220,11 @@ 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
 
-END { 1 while unlink 'bleah.pm'; 1 while unlink 'bleah.do'; }
+END {
+    1 while unlink 'bleah.pm';
+    1 while unlink 'bleah.do';
+    1 while unlink 'bleah.flg';
+}
 
 # ***interaction with pod (don't put any thing after here)***