Fix test-alignof failure.

[gnulib.git] / tests / uniwidth / test-uc_width2.sh

diff --git a/tests/uniwidth/test-uc_width2.sh b/tests/uniwidth/test-uc_width2.sh
index 7d23d2e..484288c 100755 (executable)
--- a/tests/uniwidth/test-uc_width2.sh
+++ b/tests/uniwidth/test-uc_width2.sh
@@ -4,7 +4,7 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 tmpfiles="$tmpfiles uc_width.out"
-./test-uc_width2${EXEEXT} > uc_width.out
+./test-uc_width2${EXEEXT} | LC_ALL=C tr -d '\r' > uc_width.out
 
 tmpfiles="$tmpfiles uc_width.ok"
 cat > uc_width.ok <<\EOF
@@ -16,9 +16,7 @@ cat > uc_width.ok <<\EOF
 00AE..02FF     A
 0300..036F     0
 0370..0482     A
-0483..0486     0
-0487           A
-0488..0489     0
+0483..0489     0
 048A..0590     A
 0591..05BD     0
 05BE           A
@@ -32,8 +30,8 @@ cat > uc_width.ok <<\EOF
 05C8..05FF     A
 0600..0603     0
 0604..060F     A
-0610..0615     0
-0616..064A     A
+0610..061A     0
+061B..064A     A
 064B..065E     0
 065F..066F     A
 0670           0
@@ -85,9 +83,13 @@ cat > uc_width.ok <<\EOF
 0A47..0A48     0
 0A49..0A4A     A
 0A4B..0A4D     0
-0A4E..0A6F     A
+0A4E..0A50     A
+0A51           0
+0A52..0A6F     A
 0A70..0A71     0
-0A72..0A80     A
+0A72..0A74     A
+0A75           0
+0A76..0A80     A
 0A81..0A82     0
 0A83..0ABB     A
 0ABC           0
@@ -106,12 +108,14 @@ cat > uc_width.ok <<\EOF
 0B3D..0B3E     A
 0B3F           0
 0B40           A
-0B41..0B43     0
-0B44..0B4C     A
+0B41..0B44     0
+0B45..0B4C     A
 0B4D           0
 0B4E..0B55     A
 0B56           0
-0B57..0B81     A
+0B57..0B61     A
+0B62..0B63     0
+0B64..0B81     A
 0B82           0
 0B83..0BBF     A
 0BC0           0
@@ -125,17 +129,21 @@ cat > uc_width.ok <<\EOF
 0C4A..0C4D     0
 0C4E..0C54     A
 0C55..0C56     0
-0C57..0CBB     A
+0C57..0C61     A
+0C62..0C63     0
+0C64..0CBB     A
 0CBC           0
 0CBD..0CCB     A
 0CCC..0CCD     0
 0CCE..0CE1     A
 0CE2..0CE3     0
 0CE4..0D40     A
-0D41..0D43     0
-0D44..0D4C     A
+0D41..0D44     0
+0D45..0D4C     A
 0D4D           0
-0D4E..0DC9     A
+0D4E..0D61     A
+0D62..0D63     0
+0D64..0DC9     A
 0DCA           0
 0DCB..0DD1     A
 0DD2..0DD4     0
@@ -178,14 +186,24 @@ cat > uc_width.ok <<\EOF
 0FC7..102C     A
 102D..1030     0
 1031           A
-1032           0
-1033..1035     A
-1036..1037     0
+1032..1037     0
 1038           A
-1039           0
-103A..1057     A
+1039..103A     0
+103B..103C     A
+103D..103E     0
+103F..1057     A
 1058..1059     0
-105A..10FF     A
+105A..105D     A
+105E..1060     0
+1061..1070     A
+1071..1074     0
+1075..1081     A
+1082           0
+1083..1084     A
+1085..1086     0
+1087..108C     A
+108D           0
+108E..10FF     A
 1100..115F     2
 1160..135E     A
 135F           0
@@ -214,8 +232,8 @@ cat > uc_width.ok <<\EOF
 18AA..191F     A
 1920..1922     0
 1923..1926     A
-1927..192B     0
-192C..1931     A
+1927..1928     0
+1929..1931     A
 1932           0
 1933..1938     A
 1939..193B     0
@@ -233,25 +251,37 @@ cat > uc_width.ok <<\EOF
 1B42           0
 1B43..1B6A     A
 1B6B..1B73     0
-1B74..1DBF     A
-1DC0..1DCA     0
-1DCB..1DFD     A
+1B74..1B7F     A
+1B80..1B81     0
+1B82..1BA1     A
+1BA2..1BA5     0
+1BA6..1BA7     A
+1BA8..1BA9     0
+1BAA..1C2B     A
+1C2C..1C33     0
+1C34..1C35     A
+1C36..1C37     0
+1C38..1DBF     A
+1DC0..1DE6     0
+1DE7..1DFD     A
 1DFE..1DFF     0
 1E00..200A     A
 200B..200F     0
 2010..2029     A
 202A..202E     0
 202F..205F     A
-2060..2063     0
-2064..2069     A
+2060..2064     0
+2065..2069     A
 206A..206F     0
 2070..20A8     A
 20A9           1
 20AA..20CF     A
-20D0..20EF     0
-20F0..2328     A
+20D0..20F0     0
+20F1..2328     A
 2329..232A     2
-232B..2E7F     A
+232B..2DDF     A
+2DE0..2DFF     0
+2E00..2E7F     A
 2E80..3029     2
 302A..302F     0
 3030..303E     2
@@ -261,7 +291,11 @@ cat > uc_width.ok <<\EOF
 309B..4DBF     2
 4DC0..4DFF     A
 4E00..A4CF     2
-A4D0..A801     A
+A4D0..A66E     A
+A66F..A672     0
+A673..A67B     A
+A67C..A67D     0
+A67E..A801     A
 A802           0
 A803..A805     A
 A806           0
@@ -269,7 +303,23 @@ A807..A80A A
 A80B           0
 A80C..A824     A
 A825..A826     0
-A827..ABFF     A
+A827..A8C3     A
+A8C4           0
+A8C5..A925     A
+A926..A92D     0
+A92E..A946     A
+A947..A951     0
+A952..AA28     A
+AA29..AA2E     0
+AA2F..AA30     A
+AA31..AA32     0
+AA33..AA34     A
+AA35..AA36     0
+AA37..AA42     A
+AA43           0
+AA44..AA4B     A
+AA4C           0
+AA4D..ABFF     A
 AC00..D7A3     2
 D7A4..F8FF     A
 F900..FAFF     2
@@ -278,8 +328,8 @@ FB1E                0
 FB1F..FDFF     A
 FE00..FE0F     0
 FE10..FE1F     2
-FE20..FE23     0
-FE24..FE2F     A
+FE20..FE26     0
+FE27..FE2F     A
 FE30..FE6F     2
 FE70..FEFE     A
 FEFF           0
@@ -288,7 +338,9 @@ FF61..FFDF  1
 FFE0..FFE6     2
 FFE7..FFF8     1
 FFF9..FFFB     0
-FFFC..10A00    1
+FFFC..101FC    1
+101FD          0
+101FE..10A00   1
 10A01..10A03   0
 10A04          1
 10A05..10A06   0