diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp @@ -7,7 +7,6 @@ //===----------------------------------------------------------------------===// // REQUIRES: locale.en_US.UTF-8 -// XFAIL: LIBCXX-WINDOWS-FIXME // XFAIL: LIBCXX-AIX-FIXME // XFAIL: libcpp-has-no-wide-characters @@ -58,7 +57,7 @@ assert(f.widen('.') == L'.'); assert(f.widen('a') == L'a'); assert(f.widen('1') == L'1'); -#if defined(__APPLE__) || defined(__FreeBSD__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) assert(f.widen(char(-5)) == L'\u00fb'); #else assert(f.widen(char(-5)) == wchar_t(-1)); diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp @@ -7,7 +7,6 @@ //===----------------------------------------------------------------------===// // REQUIRES: locale.en_US.UTF-8 -// XFAIL: LIBCXX-WINDOWS-FIXME // XFAIL: LIBCXX-AIX-FIXME // XFAIL: libcpp-has-no-wide-characters @@ -35,7 +34,7 @@ typedef std::ctype_byname F; std::locale ll(l, new F(LOCALE_en_US_UTF_8)); F const& f = std::use_facet(ll); - std::string in(" A\x07.a1\x85"); + std::string in(" A\x07.a1\xfb"); std::vector v(in.size()); assert(f.widen(&in[0], in.data() + in.size(), v.data()) == in.data() + in.size()); @@ -54,7 +53,7 @@ typedef std::ctype_byname F; std::locale ll(l, new F("C")); const F& f = std::use_facet(ll); - std::string in(" A\x07.a1\x85"); + std::string in(" A\x07.a1\xfb"); std::vector v(in.size()); assert(f.widen(&in[0], in.data() + in.size(), v.data()) == in.data() + in.size()); @@ -64,8 +63,8 @@ assert(v[3] == L'.'); assert(v[4] == L'a'); assert(v[5] == L'1'); -#if defined(__APPLE__) || defined(__FreeBSD__) - assert(v[6] == L'\x85'); +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) + assert(v[6] == L'\xfb'); #else assert(v[6] == wchar_t(-1)); #endif