34c34
< __FBSDID("$FreeBSD: head/lib/libc/tests/locale/mbrtoc16_test.c 290532 2015-11-08 02:06:17Z ngie $");
---
> __FBSDID("$FreeBSD: stable/10/lib/libc/tests/locale/mbrtoc16_test.c 291178 2015-11-23 08:31:41Z ngie $");
45,46c45,46
< ATF_TC_WITHOUT_HEAD(mbrtoc16_test);
< ATF_TC_BODY(mbrtoc16_test, tc)
---
> static void
> require_lc_ctype(const char *locale_name)
48,50c48
< mbstate_t s;
< size_t len;
< char16_t c16;
---
> char *lc_ctype_set;
52,54c50,53
< /*
< * C/POSIX locale.
< */
---
> lc_ctype_set = setlocale(LC_CTYPE, locale_name);
> if (lc_ctype_set == NULL)
> atf_tc_fail("setlocale(LC_CTYPE, \"%s\") failed; errno=%d",
> locale_name, errno);
56c55,56
< printf("1..1\n");
---
> ATF_REQUIRE(strcmp(lc_ctype_set, locale_name) == 0);
> }
57a58,66
> static mbstate_t s;
> static char16_t c16;
>
> ATF_TC_WITHOUT_HEAD(mbrtoc16_c_locale_test);
> ATF_TC_BODY(mbrtoc16_c_locale_test, tc)
> {
>
> require_lc_ctype("C");
>
96,98c105
< /*
< * ISO-8859-1.
< */
---
> }
100,101c107,109
< ATF_REQUIRE(strcmp(setlocale(LC_CTYPE, "en_US.ISO8859-1"),
< "en_US.ISO8859-1") == 0);
---
> ATF_TC_WITHOUT_HEAD(mbrtoc16_iso_8859_1_test);
> ATF_TC_BODY(mbrtoc16_iso_8859_1_test, tc)
> {
102a111,112
> require_lc_ctype("en_US.ISO8859-1");
>
106a117
> }
108,110c119,121
< /*
< * ISO-8859-15.
< */
---
> ATF_TC_WITHOUT_HEAD(mbrtoc16_iso_8859_15_test);
> ATF_TC_BODY(mbrtoc16_iso_8859_15_test, tc)
> {
112,113c123
< ATF_REQUIRE(strcmp(setlocale(LC_CTYPE, "en_US.ISO8859-15"),
< "en_US.ISO8859-15") == 0);
---
> require_lc_ctype("en_US.ISO8859-15");
118a129
> }
120,122c131,133
< /*
< * UTF-8.
< */
---
> ATF_TC_WITHOUT_HEAD(mbrtoc16_utf_8_test);
> ATF_TC_BODY(mbrtoc16_utf_8_test, tc)
> {
124c135
< ATF_REQUIRE(strcmp(setlocale(LC_CTYPE, "en_US.UTF-8"), "en_US.UTF-8") == 0);
---
> require_lc_ctype("en_US.UTF-8");
197c208,211
< ATF_TP_ADD_TC(tp, mbrtoc16_test);
---
> ATF_TP_ADD_TC(tp, mbrtoc16_c_locale_test);
> ATF_TP_ADD_TC(tp, mbrtoc16_iso_8859_1_test);
> ATF_TP_ADD_TC(tp, mbrtoc16_iso_8859_15_test);
> ATF_TP_ADD_TC(tp, mbrtoc16_utf_8_test);