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 bfd4a37..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..23\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 = ();
@@ -20,8 +25,9 @@ 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};
@@ -80,7 +86,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";
 
@@ -124,14 +129,17 @@ dofile();
 sub dofile { do "bleah.do"; };
 print $x;
 
-# UTF-encoded things
+# 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; 
+    return @_ == 3 && $_[2] ? pack("$_[0]", 0xFEFF) . $utf16 : $utf16;
 }
 
 $i++; do_require(bytes_to_utf16('n', qq(print "ok $i\\n"; 1;\n), 1)); # BE