Revert change 23843.

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

diff --git a/t/comp/require.t b/t/comp/require.t
index 0741561..29f5436 100755 (executable)
--- 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;
 $i = 1;
 
 my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;

-my $total_tests = 23;
-if ($Is_EBCDIC) { $total_tests = 20; }
+my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;
+my $total_tests = 44;
+if ($Is_EBCDIC || $Is_UTF8) { $total_tests = 41; }

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


@@ -27,7 +28,7 @@ sub write_file {
     binmode REQ;
     use bytes;
     print REQ @_;
     binmode REQ;
     use bytes;
     print REQ @_;

-    close REQ;
+    close REQ or die "Could not close $f: $!";

 }
 
 eval {require 5.005};
 }
 
 eval {require 5.005};


@@ -74,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 required/;

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


@@ -86,7 +87,6 @@ print "not " unless 5.5.1 gt v5.5;
 print "ok ",$i++,"\n";
 
 {
 print "ok ",$i++,"\n";
 
 {

-    use utf8;

     print "not " unless v5.5.640 eq "\x{5}\x{5}\x{280}";
     print "ok ",$i++,"\n";
 
     print "not " unless v5.5.640 eq "\x{5}\x{5}\x{280}";
     print "ok ",$i++,"\n";
 


@@ -108,6 +108,24 @@ do_require "0;\n";
 print "# $@\nnot " unless $@ =~ /did not return a true/;
 print "ok ",$i++,"\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',
 # compile-time failure in require
 do_require "1)\n";
 # bison says 'parse error' instead of 'syntax error',


@@ -115,6 +133,20 @@ do_require "1)\n";
 print "# $@\nnot " unless $@ =~ /(syntax|parse) error/mi;
 print "ok ",$i++,"\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 $@;
 # successful require
 do_require "1";
 print "# $@\nnot " if $@;


@@ -130,9 +162,26 @@ dofile();
 sub dofile { do "bleah.do"; };
 print $x;
 
 sub dofile { do "bleah.do"; };
 print $x;
 

-# UTF-encoded things - skipped on EBCDIC machines
+# 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};

 
 

-if ($Is_EBCDIC) { exit; }
+# UTF-encoded things - skipped on EBCDIC machines and on UTF-8 input
+
+if ($Is_EBCDIC || $Is_UTF8) { exit; }

 
 my $utf8 = chr(0xFEFF);
 
 
 my $utf8 = chr(0xFEFF);
 


@@ -146,7 +195,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
 
 $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)***
 
 
 # ***interaction with pod (don't put any thing after here)***