cleaner close on tests, take 2

[p5sagit/p5-mst-13.2.git] / t / comp / require.t

diff --git a/t/comp/require.t b/t/comp/require.t
index d4c9d8c..ea4b96d 100755 (executable)
--- a/t/comp/require.t
+++ b/t/comp/require.t
@@ -2,12 +2,17 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, ('.', '../lib');
+    @INC = '.';
+    push @INC, '../lib';
 }
 
 # don't make this lexical
 $i = 1;
-print "1..16\n";
+
+my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
+my $total_tests = 23;
+if ($Is_EBCDIC) { $total_tests = 20; }
+print "1..$total_tests\n";
 
 sub do_require {
     %INC = ();
@@ -19,17 +24,37 @@ sub do_require {
 sub write_file {
     my $f = shift;
     open(REQ,">$f") or die "Can't write '$f': $!";
+    binmode REQ;
+    use bytes;
     print REQ @_;
-    close REQ;
+    close REQ or die "Could not close $f: $!";
 }
 
+eval {require 5.005};
+print "# $@\nnot " if $@;
+print "ok ",$i++,"\n";
+
+eval { require 5.005 };
+print "# $@\nnot " if $@;
+print "ok ",$i++,"\n";
+
+eval { require 5.005; };
+print "# $@\nnot " if $@;
+print "ok ",$i++,"\n";
+
+eval {
+    require 5.005
+};
+print "# $@\nnot " if $@;
+print "ok ",$i++,"\n";
+
 # new style version numbers
 
 eval { require v5.5.630; };
 print "# $@\nnot " if $@;
 print "ok ",$i++,"\n";
 
-eval { require v10.0.2; };
+eval { require 10.0.2; };
 print "# $@\nnot " unless $@ =~ /^Perl v10\.0\.2 required/;
 print "ok ",$i++,"\n";
 
@@ -37,31 +62,30 @@ eval q{ use v5.5.630; };
 print "# $@\nnot " if $@;
 print "ok ",$i++,"\n";
 
-eval q{ use v10.0.2; };
+eval q{ use 10.0.2; };
 print "# $@\nnot " unless $@ =~ /^Perl v10\.0\.2 required/;
 print "ok ",$i++,"\n";
 
-my $ver = v5.5.630;
+my $ver = 5.005_63;
 eval { require $ver; };
 print "# $@\nnot " if $@;
 print "ok ",$i++,"\n";
 
-$ver = v10.0.2;
+# check inaccurate fp
+$ver = 10.2;
 eval { require $ver; };
-print "# $@\nnot " unless $@ =~ /^Perl v10\.0\.2 required/;
-print "ok ",$i++,"\n";
-
-print "not " unless v5.5.1 gt v5.5;
+print "# $@\nnot " unless $@ =~ /^Perl v10\.200\.0 required/;
 print "ok ",$i++,"\n";
 
-print "not " unless 5.005_01 > v5.5;
+$ver = 10.000_02;
+eval { require $ver; };
+print "# $@\nnot " unless $@ =~ /^Perl v10\.0\.20 required/;
 print "ok ",$i++,"\n";
 
-print "not " unless 5.005_64 - v5.5.640 < 0.0000001;
+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";
 
@@ -95,7 +119,33 @@ do_require "1";
 print "# $@\nnot " if $@;
 print "ok ",$i++,"\n";
 
-END { 1 while unlink 'bleah.pm'; }
+# do FILE shouldn't see any outside lexicals
+my $x = "ok $i\n";
+write_file("bleah.do", <<EOT);
+\$x = "not ok $i\\n";
+EOT
+do "bleah.do";
+dofile();
+sub dofile { do "bleah.do"; };
+print $x;
+
+# UTF-encoded things - skipped on EBCDIC machines
+
+if ($Is_EBCDIC) { exit; }
+
+my $utf8 = chr(0xFEFF);
+
+$i++; do_require(qq(${utf8}print "ok $i\n"; 1;\n));
+
+sub bytes_to_utf16 {
+    my $utf16 = pack("$_[0]*", unpack("C*", $_[1]));
+    return @_ == 3 && $_[2] ? pack("$_[0]", 0xFEFF) . $utf16 : $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'; }
 
 # ***interaction with pod (don't put any thing after here)***