localedata: Use hexadecimal character escape on tests

Instead of latin1 ones.

Reviewed-by: Sam James <sam@gentoo.org>

diff --git a/localedata/bug-iconv-trans.c b/localedata/bug-iconv-trans.c
index f1a0416547afedb91b5d62d7575a7646159b07e7..c4c0ab74f1295352ff6a58a24210f8737202e75a 100644 (file)
--- a/localedata/bug-iconv-trans.c
+++ b/localedata/bug-iconv-trans.c
@@ -7,7 +7,7 @@ int
 main (void)
 {
   iconv_t cd;
-  const char str[] = "ÄäÖöÜüß";
+  const char str[] = "\xc4\xe4\xd6\xf6\xdc\xfc\xdf";
   const char expected[] = "AEaeOEoeUEuess";
   char *inptr = (char *) str;
   size_t inlen = strlen (str) + 1;

diff --git a/localedata/tests-mbwc/dat_mbrtowc.c b/localedata/tests-mbwc/dat_mbrtowc.c
index b8eb3dd2101649dc5481e1cfc362861065056468..0387045bd13cf7bcb15b50cf332cff9e776b6fcc 100644 (file)
--- a/localedata/tests-mbwc/dat_mbrtowc.c
+++ b/localedata/tests-mbwc/dat_mbrtowc.c
@@ -23,9 +23,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
       { /*----------------- #01 -----------------*/
        {
          {
-           { 1, 1, "ÄÖÜ",         1,            0, 0 },
-           { 1, 1, "ÄÖÜ",         2,            0, 0 },
-           { 1, 1, "ÄÖÜ",         USE_MBCURMAX, 0, 0 },
+           { 1, 1, "\xc4\xd6\xdc",        1,            0, 0 },
+           { 1, 1, "\xc4\xd6\xdc",        2,            0, 0 },
+           { 1, 1, "\xc4\xd6\xdc",        USE_MBCURMAX, 0, 0 },
          }
        },
        {
@@ -39,9 +39,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
       { /*----------------- #02 -----------------*/
        {
          {
-           { 1, 1, "ÄÖÜ",          1,            0, 0 },
-           { 1, 1, "ÄÖÜ",          2,            0, 0 },
-           { 1, 1, "ÄÖÜ",          USE_MBCURMAX, 0, 0 },
+           { 1, 1, "\xc4\xd6\xdc",         1,            0, 0 },
+           { 1, 1, "\xc4\xd6\xdc",         2,            0, 0 },
+           { 1, 1, "\xc4\xd6\xdc",         USE_MBCURMAX, 0, 0 },
          }
        },
        {

diff --git a/localedata/tests-mbwc/dat_mbsrtowcs.c b/localedata/tests-mbwc/dat_mbsrtowcs.c
index e1ee1819a866cda536cd1a3179f9e6c6df35346f..3604accc05c12303d3fd73cc8157400a4a4b4ed1 100644 (file)
--- a/localedata/tests-mbwc/dat_mbsrtowcs.c
+++ b/localedata/tests-mbwc/dat_mbsrtowcs.c
@@ -15,9 +15,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = {
       { /*----------------- #01 -----------------*/
        {
          {
-           { 1,  "üäö",            4,                   0,0 },
-           { 1,  "üäö",            3,                   0,0 },
-           { 1,  "üäö",            2,                   0,0 },
+           { 1,  "\xfc\xe4\xf6",           4,                   0,0 },
+           { 1,  "\xfc\xe4\xf6",           3,                   0,0 },
+           { 1,  "\xfc\xe4\xf6",           2,                   0,0 },
          }
        },
        {
@@ -31,9 +31,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = {
       { /*----------------- #02 -----------------*/
        {
          {
-           { 1,  "üäö",            4,                   0,0 },
-           { 1,  "",               1,                   0,0 },
-           { 0,  "üäö",            4,                   0,0 },
+           { 1,  "\xfc\xe4\xf6",           4,                   0,0 },
+           { 1,  "",                       1,                   0,0 },
+           { 0,  "\xfc\xe4\xf6",           4,                   0,0 },
          }
        },
        {

diff --git a/localedata/tests-mbwc/dat_strcoll.c b/localedata/tests-mbwc/dat_strcoll.c
index b729ae9e894a3757c3c1e571c6304756fa70517c..fd14090eed9ec7ed9df8bd6065ed54ed8107efca 100644 (file)
--- a/localedata/tests-mbwc/dat_strcoll.c
+++ b/localedata/tests-mbwc/dat_strcoll.c
@@ -27,13 +27,16 @@ TST_STRCOLL tst_strcoll_loc [] = {
   {
     { Tstrcoll, TST_LOC_de },
     {
-      { /*input.*/ { "ÄBCDEFG", "ÄBCDEFG"            },  /* #1 */
+      { /*input.*/ { "\xc4\x42\x43\x44\x45\x46\x47",
+                    "\xc4\x42\x43\x44\x45\x46\x47"   },  /* #1 */
        /*expect*/ { 0,1,0,                           },
       },
-      { /*input.*/ { "XX Ä XX", "XX B XX"            },  /* #2 */
+      { /*input.*/ { "\x58\x58\x20\xc4\x20\x58\x58",
+                    "XX B XX"                        },  /* #2 */
        /*expect*/ { 0,0,-1,                          },
       },
-      { /*input.*/ { "XX B XX", "XX Ä XX"            },  /* #3 */
+      { /*input.*/ { "XX B XX",
+                    "\x58\x58\x20\xc4\x20\x58\x58"   },  /* #3 */
        /*expect*/ { 0,0,+1,                          },
       },
       { /*input.*/ { "B",      "a"                   },  /* #4 */
@@ -48,10 +51,10 @@ TST_STRCOLL tst_strcoll_loc [] = {
       { /*input.*/ { "A",      "b"                   },  /* #7 */
        /*expect*/ { 0,0,-1,                          },
       },
-      { /*input.*/ { "ä",      "B"                   },  /* #8 */
+      { /*input.*/ { "\xe4",   "B"                   },  /* #8 */
        /*expect*/ { 0,0,-1,                          },
       },
-      { /*input.*/ { "B",      "ä"                   },  /* #9 */
+      { /*input.*/ { "B",      "\xe4"                },  /* #9 */
        /*expect*/ { 0,0,+1,                          },
       },
       { .is_last = 1 } /* Last element.  */

diff --git a/localedata/tests-mbwc/dat_swscanf.c b/localedata/tests-mbwc/dat_swscanf.c
index 7f6583222a744533b46e03cd4d2a866fc537433a..eb813f22670378ba50b10242899fe39f3f646187 100644 (file)
--- a/localedata/tests-mbwc/dat_swscanf.c
+++ b/localedata/tests-mbwc/dat_swscanf.c
@@ -31,7 +31,7 @@ TST_SWSCANF tst_swscanf_loc [] =
        { /* The fields are: err_val, ret_flag, ret_val,
             val_int, val_uns, val_flt, val_c, val_s, val_S.  */
          0,1,5,
-         -1, 2, 3.3, 'ä', "ÄÜ", { 0x0000, },
+         -1, 2, 3.3, '\xe4', "\xc4\xdc", { 0x0000, },
        },
       },
       /*------------------------ 02 -----------------------*/

diff --git a/localedata/tests-mbwc/dat_wcrtomb.c b/localedata/tests-mbwc/dat_wcrtomb.c
index 8500f684430178ae09c58fd7dfe39aaa6cafb19c..826e373ea608c2975263b02eccac0bc3641c1b8e 100644 (file)
--- a/localedata/tests-mbwc/dat_wcrtomb.c
+++ b/localedata/tests-mbwc/dat_wcrtomb.c
@@ -13,11 +13,11 @@ TST_WCRTOMB tst_wcrtomb_loc [] = {
     {
       /* #01 : normal case                            */
       { /*input.*/ { 1,                 0x00FC,   0,0 },
-       /*expect*/ { 0,    1,1,  "ü"           },
+       /*expect*/ { 0,    1,1,  "\xfc"        },
       },
       /* #02 : normal case                            */
       { /*input.*/ { 1,                 0x00D6,   0,0 },
-       /*expect*/ { 0,    1,1,  "Ö"           },
+       /*expect*/ { 0,    1,1,  "\xd6"        },
       },
       /* #03 : error case                             */
       { /*input.*/ { 1,                 0xFFA1,   0,0 },

diff --git a/localedata/tests-mbwc/dat_wcsrtombs.c b/localedata/tests-mbwc/dat_wcsrtombs.c
index d3148b2a55dd296b8e47042e74ccb2091e8afa51..e98a53348543ae48fdf90217092d8307e5a3526c 100644 (file)
--- a/localedata/tests-mbwc/dat_wcsrtombs.c
+++ b/localedata/tests-mbwc/dat_wcsrtombs.c
@@ -26,26 +26,26 @@ TST_WCSRTOMBS tst_wcsrtombs_loc [] = {
       },
       /* #02 : Only one chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,      { 0x00C4,0x00D6,0x00DC,0x0000 }, 1, 0, 0 },
-       /*expect*/ { 0,1,1,      "Ä"                                     },
+       /*expect*/ { 0,1,1,      "\xc4"                                  },
       },
       /* #03 : Only two chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,      { 0x00C4,0x00D6,0x00DC,0x0000 }, 2, 0, 0 },
-       /*expect*/ { 0,1,2,      "ÄÖ"                                    },
+       /*expect*/ { 0,1,2,      "\xc4\xd6"                              },
       },
       /* #04 : Only three chars should be stored in s. No null
               termination.  */
       { /*input.*/ { 1,1,      { 0x00C4,0x00D6,0x00DC,0x0000 }, 3, 0, 0 },
-       /*expect*/ { 0,1,3,      "ÄÖÜ"                                   },
+       /*expect*/ { 0,1,3,      "\xc4\xd6\xdc"                          },
       },
       /* #05 : Only three chars should be stored in s with a null
               termination. */
       { /*input.*/ { 1,1,      { 0x00C4,0x00D6,0x00DC,0x0000 }, 4, 0, 0 },
-       /*expect*/ { 0,1,3,      "ÄÖÜ"                                   },
+       /*expect*/ { 0,1,3,      "\xc4\xd6\xdc"                          },
       },
       /* #06 : Only three chars should be stored in s with a null
               termination. */
       { /*input.*/ { 1,1,      { 0x00C4,0x00D6,0x00DC,0x0000 }, 5, 0, 0 },
-       /*expect*/ { 0,1,3,      "ÄÖÜ"                                   },
+       /*expect*/ { 0,1,3,      "\xc4\xd6\xdc"                          },
       },
       /* #07 : Invalid mb sequence. No chars should be stored in s.  */
       { /*input.*/ { 1,1,      { 0x0201,0x0221,0x0000,0x0000 }, 2, 0, 0 },

diff --git a/localedata/tests-mbwc/dat_wcstombs.c b/localedata/tests-mbwc/dat_wcstombs.c
index a6dd0ec662820f66025b6bb1d1050af38433fc08..ad9f44fec33043688d5e558c6b977ba6ad60e0b7 100644 (file)
--- a/localedata/tests-mbwc/dat_wcstombs.c
+++ b/localedata/tests-mbwc/dat_wcstombs.c
@@ -25,26 +25,26 @@ TST_WCSTOMBS tst_wcstombs_loc [] = {
       },
       /* #02 : Only one chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,             { 0x00C4,0x00D6,0x00DC,0x0000 }, 1 },
-       /*expect*/ { 0,1,1,      "Ä"                                      },
+       /*expect*/ { 0,1,1,      "\xc4"                                   },
       },
       /* #03 : Only two chars should be stored in s. No null termination.  */
       { /*input.*/ { 1,1,             { 0x00C4,0x00D6,0x00DC,0x0000 }, 2 },
-       /*expect*/ { 0,1,2,      "ÄÖ"                                     },
+       /*expect*/ { 0,1,2,      "\xc4\xd6"                               },
       },
       /* #04 : Only three chars should be stored in s. No null
               termination.  */
       { /*input.*/ { 1,1,             { 0x00C4,0x00D6,0x00DC,0x0000 }, 3 },
-       /*expect*/ { 0,1,3,      "ÄÖÜ"                                    },
+       /*expect*/ { 0,1,3,      "\xc4\xd6\xdc"                           },
       },
       /* #05 : Only three chars should be stored in s with a null
               termination.  */
       { /*input.*/ { 1,1,             { 0x00C4,0x00D6,0x00DC,0x0000 }, 4 },
-       /*expect*/ { 0,1,3,      "ÄÖÜ"                                    },
+       /*expect*/ { 0,1,3,      "\xc4\xd6\xdc"                           },
       },
       /* #06 : Only three chars should be stored in s with a null
               termination.  */
       { /*input.*/ { 1,1,             { 0x00C4,0x00D6,0x00DC,0x0000 }, 5 },
-       /*expect*/ { 0,1,3,      "ÄÖÜ"                                    },
+       /*expect*/ { 0,1,3,      "\xc4\xd6\xdc"                           },
       },
       /* #07 : Invalid mb sequence. No chars should be stored in s. */
       { /*input.*/ { 1,1,             { 0x0201,0x0221,0x0000,0x0000 }, 2 },

diff --git a/localedata/tests-mbwc/dat_wctomb.c b/localedata/tests-mbwc/dat_wctomb.c
index 7394ca530bd3abf5dcddae37737d34274a0544fe..1b8227e6e91e245f33a12ccebf4a1cb1a31e47f5 100644 (file)
--- a/localedata/tests-mbwc/dat_wctomb.c
+++ b/localedata/tests-mbwc/dat_wctomb.c
@@ -59,11 +59,11 @@ TST_WCTOMB tst_wctomb_loc [] = {
     {
       /* #01 : normal case                */
       { /*input.*/ { 1,           0x00C4  },
-       /*expect*/ { 0,1,1,  "Ä"           },
+       /*expect*/ { 0,1,1,  "\xc4"        },
       },
       /* #02 : normal case                */
       { /*input.*/ { 1,           0x00DC  },
-       /*expect*/ { 0,1,1,  "Ü"           },
+       /*expect*/ { 0,1,1,  "\xdc"        },
       },
       /* #03 : normal case                */
       { /*input.*/ { 1,           0x0092  },

diff --git a/localedata/tst-xlocale1.c b/localedata/tst-xlocale1.c
index 9f545a02c39b2e53bc9dd65f4e8d4eeba4e31717..e6c5970759c68a9761794fb9debd161d908ed11b 100644 (file)
--- a/localedata/tst-xlocale1.c
+++ b/localedata/tst-xlocale1.c
@@ -13,9 +13,9 @@ static struct
   {
     { "C", "TRANSLIT", "translit", 0 },
     { "de_DE.ISO-8859-1", "TRANSLIT", "translit", 0 },
-    { "de_DE.ISO-8859-1", "TRANSLIT", "trÄnslit", -1 },
+    { "de_DE.ISO-8859-1", "TRANSLIT", "tr\xc4nslit", -1 },
     { "de_DE.UTF-8", "TRANSLIT", "translit", 0 },
-    { "de_DE.ISO-8859-1", "ä", "Ä", 1 }
+    { "de_DE.ISO-8859-1", "\xe4", "\xc4", 1 }
   };
 #define ntests (sizeof (tests) / sizeof (tests[0]))
 

diff --git a/localedata/tst-xlocale2.c b/localedata/tst-xlocale2.c
index 7f990501686df97292fda1c33f108a6ffdb03721..3387d7f4850e197e70f5fad6f28419a57d0a2286 100644 (file)
--- a/localedata/tst-xlocale2.c
+++ b/localedata/tst-xlocale2.c
@@ -36,7 +36,7 @@ main (void)
 }
 
 
-static const char str[] = "0123456789abcdef ABCDEF ghijklmnopqrstuvwxyzäÄöÖüÜ";
+static const char str[] = "0123456789abcdef ABCDEF ghijklmnopqrstuvwxyz\xe4\xc4\xf6\xd6\xfc\xdc";
 static const char exd[] = "11111111110000000000000000000000000000000000000000";
 static const char exa[] = "00000000001111110111111011111111111111111111111111";
 static const char exx[] = "11111111111111110111111000000000000000000000000000";