Here is a patch to address comp/require.t, io/utf8.t, lib/digest.t,
lib/glob-basic.t, and lib/md5-file.t.  I've another couple of patches to
address lib/mimeqp.t and pragma/warnings.t; but they may require further
discussion on perl-mvs at this time.  I do not yet have patches for
op/append.t, op/pat.t, or op/tr.t which may indicate regular expression
bugs in current ebcdic perls. Nor do I yet have patches for lib/io_unix.t
or pragma/locale.t which may be uncovering bugs in the C RTL.

diff -ru perl.9452/t/comp/require.t perl/t/comp/require.t
--- perl.9452/t/comp/require.t  Thu Mar 29 12:45:08 2001
+++ perl/t/comp/require.t       Thu Mar 29 12:48:09 2001
@@ -8,7 +8,11 @@
 
 # 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 = ();
@@ -126,7 +130,10 @@
 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));
diff -ru perl.9452/t/io/utf8.t perl/t/io/utf8.t
--- perl.9452/t/io/utf8.t       Thu Mar 29 11:54:30 2001
+++ perl/t/io/utf8.t    Thu Mar 29 17:49:08 2001
@@ -10,7 +10,9 @@
 }
 
 $| = 1;
-print "1..25\n";
+my $total_tests = 25;
+if (ord('A') == 193) { $total_tests = 24; } # EBCDIC platforms do not warn on UTF-8
+print "1..$total_tests\n";
 
 open(F,"+>:utf8",'a');
 print F chr(0x100).'�';
@@ -30,13 +32,21 @@
 print "ok 5\n";
 seek(F,0,0);
 binmode(F,":bytes");
-print "not " unless getc(F) eq chr(0xc4);
+my $chr = chr(0xc4);
+if (ord('A') == 193) { $chr = chr(0x8c); } # EBCDIC
+print "not " unless getc(F) eq $chr;
 print "ok 6\n";
-print "not " unless getc(F) eq chr(0x80);
+$chr = chr(0x80);
+if (ord('A') == 193) { $chr = chr(0x41); } # EBCDIC
+print "not " unless getc(F) eq $chr;
 print "ok 7\n";
-print "not " unless getc(F) eq chr(0xc2);
+$chr = chr(0xc2);
+if (ord('A') == 193) { $chr = chr(0x80); } # EBCDIC
+print "not " unless getc(F) eq $chr;
 print "ok 8\n";
-print "not " unless getc(F) eq chr(0xa3);
+$chr = chr(0xa3);
+if (ord('A') == 193) { $chr = chr(0x44); } # EBCDIC
+print "not " unless getc(F) eq $chr;
 print "ok 9\n";
 print "not " unless getc(F) eq "\n";
 print "ok 10\n";
@@ -70,7 +80,9 @@
 open F, "a" or die $!; # Not UTF
 $x = <F>;
 chomp($x);
-print "not " unless $x eq chr(196).chr(172);
+$chr = chr(196).chr(172);
+if (ord('A') == 193) { $chr = chr(141).chr(83); } # EBCDIC
+print "not " unless $x eq $chr;
 print "ok 15\n";
 close F;
 
@@ -99,7 +111,7 @@
 }
 
 { my $x = tell(F);
-    { use bytes; $y += 3;}
+    { use bytes; if (ord('A')==193){$y += 2;}else{$y += 3;}} # EBCDIC ASCII
     print "not ($x,$y) " unless $x == $y;
     print "ok 19\n";
 }
@@ -109,7 +121,9 @@
 open F, "a" or die $!; # Not UTF
 $x = <F>;
 chomp($x);
-printf "not (%vd) ", $x unless $x eq v196.172.194.130;
+$chr = v196.172.194.130;
+if (ord('A') == 193) { $chr = v141.83.130; } # EBCDIC
+printf "not (%vd) ", $x unless $x eq $chr;
 print "ok 20\n";
 
 open F, "<:utf8", "a" or die $!;
@@ -135,7 +149,9 @@
 
 open F, "<", "a" or die $!;
 $x = <F>; chomp $x;
-print "not " unless $x eq v196.172.130;
+$chr = v196.172.130;
+if (ord('A') == 193) { $chr = v141.83.130; } # EBCDIC
+print "not " unless $x eq $chr;
 print "ok 23\n";
 
 # Right.
@@ -148,7 +164,7 @@
 
 open F, "<", "a" or die $!;
 $x = <F>; chomp $x;
-print "not " unless $x eq v196.172.130;
+print "not " unless $x eq $chr;
 print "ok 24\n";
 
 # Now we have a deformed file.
diff -ru perl.9452/t/lib/digest.t perl/t/lib/digest.t
--- perl.9452/t/lib/digest.t    Thu Mar 29 12:22:58 2001
+++ perl/t/lib/digest.t Thu Mar 29 12:28:34 2001
@@ -7,10 +7,15 @@
 
 use Digest;
 
-print "not " unless Digest->MD5->add("abc")->hexdigest eq 
"900150983cd24fb0d6963f7d28e17f72";
+my $hexdigest = "900150983cd24fb0d6963f7d28e17f72";
+if (ord('A') == 193) { # EBCDIC
+    $hexdigest = "fe4ea0d98f9cd8d1d27f102a93cb0bb0"; # IBM-1047
+}
+
+print "not " unless Digest->MD5->add("abc")->hexdigest eq $hexdigest;
 print "ok 1\n";
 
-print "not " unless Digest->MD5->add("abc")->hexdigest eq 
"900150983cd24fb0d6963f7d28e17f72";
+print "not " unless Digest->MD5->add("abc")->hexdigest eq $hexdigest;
 print "ok 2\n";
 
 eval {
diff -ru perl.9452/t/lib/glob-basic.t perl/t/lib/glob-basic.t
--- perl.9452/t/lib/glob-basic.t        Thu Mar 29 12:29:23 2001
+++ perl/t/lib/glob-basic.t     Thu Mar 29 12:33:02 2001
@@ -130,6 +130,10 @@
 chdir "pteerslt";
 @f_ascii = qw(A.test B.test C.test a.test b.test c.test);
 @f_alpha = qw(A.test a.test B.test b.test C.test c.test);
+if (ord('A') == 193) { # EBCDIC char sets sort lower case before UPPER
+    @f_ascii = sort(@f_ascii);
+    @f_alpha = qw(a.test A.test b.test B.test c.test C.test);
+}
 for (@f_ascii) {
     open T, "> $_";
     close T;
diff -ru perl.9452/t/lib/md5-file.t perl/t/lib/md5-file.t
--- perl.9452/t/lib/md5-file.t  Thu Mar 29 12:34:37 2001
+++ perl/t/lib/md5-file.t       Thu Mar 29 12:40:37 2001
@@ -15,7 +15,7 @@
 
 if (ord('A') == 193) { # EBCDIC
 $EXPECT = <<EOT;
-a88bc216e9848a9d57488026f4bd9185  ext/Digest/MD5/MD5.pm
+95a81f17a8e6c2273aecac12d8c4cb90  ext/Digest/MD5/MD5.pm
 c1eb144eccdad16fc34399cb4ab2e136  ext/Digest/MD5/MD5.xs
 EOT
 } else { # ASCII
End of Patch.

Peter Prymmer



Reply via email to