# HG changeset patch # User Bruno Haible # Date 1229743280 -3600 # Node ID f4d48672847f0d83b443f19cd3a8d399d1bd16b8 # Parent 4200847287e83647d013292d393008e195ab4d5e Avoid test failure on platforms where sizeof (wchar_t) < sizeof (int). diff --git a/tests/test-mbrtowc.c b/tests/test-mbrtowc.c --- a/tests/test-mbrtowc.c +++ b/tests/test-mbrtowc.c @@ -120,7 +120,7 @@ wc = 0xBADFACE; ret = mbrtowc (&wc, NULL, 5, &state); ASSERT (ret == 0); - ASSERT (wc == 0xBADFACE); + ASSERT (wc == (wchar_t) 0xBADFACE); ASSERT (mbsinit (&state)); } @@ -185,7 +185,7 @@ wc = 0xBADFACE; ret = mbrtowc (&wc, input + 1, 1, &state); ASSERT (ret == (size_t)(-2)); - ASSERT (wc == 0xBADFACE); + ASSERT (wc == (wchar_t) 0xBADFACE); ASSERT (!mbsinit (&state)); input[1] = '\0'; @@ -235,7 +235,7 @@ wc = 0xBADFACE; ret = mbrtowc (&wc, input + 1, 1, &state); ASSERT (ret == (size_t)(-2)); - ASSERT (wc == 0xBADFACE); + ASSERT (wc == (wchar_t) 0xBADFACE); ASSERT (!mbsinit (&state)); input[1] = '\0'; @@ -287,7 +287,7 @@ wc = 0xBADFACE; ret = mbrtowc (&wc, input + 1, 1, &state); ASSERT (ret == (size_t)(-2)); - ASSERT (wc == 0xBADFACE); + ASSERT (wc == (wchar_t) 0xBADFACE); ASSERT (!mbsinit (&state)); input[1] = '\0'; diff --git a/tests/test-mbsrtowcs.c b/tests/test-mbsrtowcs.c --- a/tests/test-mbsrtowcs.c +++ b/tests/test-mbsrtowcs.c @@ -68,7 +68,7 @@ src = ""; ret = mbsrtowcs (&wc, &src, 0, &state); ASSERT (ret == 0); - ASSERT (wc == 0xBADFACE); + ASSERT (wc == (wchar_t) 0xBADFACE); ASSERT (mbsinit (&state)); wc = 0xBADFACE; @@ -133,10 +133,10 @@ ASSERT (buf[1] == 'e'); ASSERT (buf[2] == 'r'); ASSERT (buf[3] == 0); - ASSERT (buf[4] == 0xBADFACE); + ASSERT (buf[4] == (wchar_t) 0xBADFACE); } else - ASSERT (buf[1] == 0xBADFACE); + ASSERT (buf[1] == (wchar_t) 0xBADFACE); ASSERT (mbsinit (&state)); } return 0; @@ -157,7 +157,7 @@ wc = 0xBADFACE; ret = mbrtowc (&wc, input + 1, 1, &state); ASSERT (ret == (size_t)(-2)); - ASSERT (wc == 0xBADFACE); + ASSERT (wc == (wchar_t) 0xBADFACE); ASSERT (!mbsinit (&state)); input[1] = '\0'; @@ -178,10 +178,10 @@ ASSERT (buf[2] == 'e'); ASSERT (buf[3] == 'r'); ASSERT (buf[4] == 0); - ASSERT (buf[5] == 0xBADFACE); + ASSERT (buf[5] == (wchar_t) 0xBADFACE); } else - ASSERT (buf[2] == 0xBADFACE); + ASSERT (buf[2] == (wchar_t) 0xBADFACE); ASSERT (mbsinit (&state)); } return 0; @@ -202,7 +202,7 @@ wc = 0xBADFACE; ret = mbrtowc (&wc, input + 1, 1, &state); ASSERT (ret == (size_t)(-2)); - ASSERT (wc == 0xBADFACE); + ASSERT (wc == (wchar_t) 0xBADFACE); ASSERT (!mbsinit (&state)); input[1] = '\0'; @@ -223,10 +223,10 @@ ASSERT (buf[2] == 'e'); ASSERT (buf[3] == 'r'); ASSERT (buf[4] == 0); - ASSERT (buf[5] == 0xBADFACE); + ASSERT (buf[5] == (wchar_t) 0xBADFACE); } else - ASSERT (buf[2] == 0xBADFACE); + ASSERT (buf[2] == (wchar_t) 0xBADFACE); ASSERT (mbsinit (&state)); } return 0; @@ -247,7 +247,7 @@ wc = 0xBADFACE; ret = mbrtowc (&wc, input + 1, 1, &state); ASSERT (ret == (size_t)(-2)); - ASSERT (wc == 0xBADFACE); + ASSERT (wc == (wchar_t) 0xBADFACE); ASSERT (!mbsinit (&state)); input[1] = '\0'; @@ -268,10 +268,10 @@ ASSERT (buf[2] == 'e'); ASSERT (buf[3] == 'r'); ASSERT (buf[4] == 0); - ASSERT (buf[5] == 0xBADFACE); + ASSERT (buf[5] == (wchar_t) 0xBADFACE); } else - ASSERT (buf[2] == 0xBADFACE); + ASSERT (buf[2] == (wchar_t) 0xBADFACE); ASSERT (mbsinit (&state)); } return 0;