From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sat, 23 Feb 2002 20:05:10 +0000 (+0000)
Subject: Retract #14571: there may be a better solution than
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7ac4cfc1a831c8fe810302b2ae5c11520fbd6a1a;p=p5sagit%2Fp5-mst-13.2.git

Retract #14571: there may be a better solution than
tweaking the test.

p4raw-id: //depot/perl@14846
---

diff --git a/ext/Unicode/Normalize/t/norm.t b/ext/Unicode/Normalize/t/norm.t
index b75b295..970e671 100644
--- a/ext/Unicode/Normalize/t/norm.t
+++ b/ext/Unicode/Normalize/t/norm.t
@@ -24,24 +24,9 @@ sub hexNFD {
   unpack 'U*', normalize 'NFD', pack 'U*', map hex(), split ' ', shift;
 }
 
-my $ordA   = ord("A");
-my $ASCII  = $ordA == 0x41;
-my $EBCDIC = $ordA == 0xc1;
-
-if ($ASCII) {
-  ok(hexNFC("0061 0315 0300 05AE 05C4 0062"), "00E0 05AE 05C4 0315 0062");
-  ok(hexNFC("00E0 05AE 05C4 0315 0062"),      "00E0 05AE 05C4 0315 0062");
-  ok(hexNFC("0061 05AE 0300 05C4 0315 0062"), "00E0 05AE 05C4 0315 0062");
-} elsif ($EBCDIC) {
-  # A WITH GRAVE  is 0044 in EBCDIC, not 00E0
-  # SMALL LATIN B is 0082 in EBCDIC, not 0062
-  ok(hexNFC("0061 0315 0300 05AE 05C4 0062"), "0044 05AE 05C4 0315 0082");
-  ok(hexNFC("00E0 05AE 05C4 0315 0062"),      "0044 05AE 05C4 0315 0082");
-  ok(hexNFC("0061 05AE 0300 05C4 0315 0062"), "0044 05AE 05C4 0315 0082");
-} else {
-  skip("Neither ASCII nor EBCDIC based") for 1..3;
-}
-
+ok(hexNFC("0061 0315 0300 05AE 05C4 0062"), "00E0 05AE 05C4 0315 0062");
+ok(hexNFC("00E0 05AE 05C4 0315 0062"),      "00E0 05AE 05C4 0315 0062");
+ok(hexNFC("0061 05AE 0300 05C4 0315 0062"), "00E0 05AE 05C4 0315 0062");
 ok(hexNFC("0045 0304 0300 AC00 11A8"), "1E14 AC01");
 ok(hexNFC("1100 1161 1100 1173 11AF"), "AC00 AE00");
 ok(hexNFC("1100 0300 1161 1173 11AF"), "1100 0300 1161 1173 11AF");
@@ -49,30 +34,10 @@ ok(hexNFC("1100 0300 1161 1173 11AF"), "1100 0300 1161 1173 11AF");
 ok(hexNFD("0061 0315 0300 05AE 05C4 0062"), "0061 05AE 0300 05C4 0315 0062");
 ok(hexNFD("00E0 05AE 05C4 0315 0062"),      "0061 05AE 0300 05C4 0315 0062");
 ok(hexNFD("0061 05AE 0300 05C4 0315 0062"), "0061 05AE 0300 05C4 0315 0062");
-
-if ($ASCII) {
-  ok(hexNFC("0061 05C4 0315 0300 05AE 0062"), "0061 05AE 05C4 0300 0315 0062");
-  ok(hexNFC("0061 05AE 05C4 0300 0315 0062"), "0061 05AE 05C4 0300 0315 0062");
-} elsif ($EBCDIC) {
-  # SMALL LATIN A is 0081 in EBCDIC, not 0061
-  # SMALL LATIN B is 0082 in EBCDIC, not 0062
-  ok(hexNFC("0061 05C4 0315 0300 05AE 0062"), "0081 05AE 05C4 0300 0315 0082");
-  ok(hexNFC("0061 05AE 05C4 0300 0315 0062"), "0081 05AE 05C4 0300 0315 0082");
-} else {
-  skip("Neither ASCII nor EBCDIC based") for 1..2;
-}
-
+ok(hexNFC("0061 05C4 0315 0300 05AE 0062"), "0061 05AE 05C4 0300 0315 0062");
+ok(hexNFC("0061 05AE 05C4 0300 0315 0062"), "0061 05AE 05C4 0300 0315 0062");
 ok(hexNFD("0061 05C4 0315 0300 05AE 0062"), "0061 05AE 05C4 0300 0315 0062");
 ok(hexNFD("0061 05AE 05C4 0300 0315 0062"), "0061 05AE 05C4 0300 0315 0062");
-
-if ($ASCII) {
-  ok(hexNFC("0000 0041 0000 0000"), "0000 0041 0000 0000");
-} elsif ($EBCDIC) {
-  # CAPITAL LATIN A is 00C1 in EBCDIC, not 0041
-  ok(hexNFC("0000 0041 0000 0000"), "0000 00C1 0000 0000");
-} else {
-  skip("Neither ASCII nor EBCDIC based");
-}
-
+ok(hexNFC("0000 0041 0000 0000"), "0000 0041 0000 0000");
 ok(hexNFD("0000 0041 0000 0000"), "0000 0041 0000 0000");