From b8f63fc7c51e27da9b9fbba44069c6d6a0ee87bf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 1 Mar 2021 00:22:39 +0100 Subject: [PATCH] Skip wxLocale wxLANGUAGE_DEFAULT test in ANSI builds The test fails there, but we don't really care about it, Unicode is required for any level of acceptable locale support anyhow. --- tests/intl/intltest.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp index 4c6b473b71..c19628b4c0 100644 --- a/tests/intl/intltest.cpp +++ b/tests/intl/intltest.cpp @@ -226,6 +226,10 @@ void IntlTestCase::IsAvailable() CPPUNIT_ASSERT_EQUAL( origLocale, setlocale(LC_ALL, NULL) ); } +// The test may fail in ANSI builds because of unsupported encoding, but we +// don't really care about this build anyhow, so just skip it there. +#if wxUSE_UNICODE + TEST_CASE("wxLocale::Default", "[locale]") { wxLocale loc; @@ -233,4 +237,6 @@ TEST_CASE("wxLocale::Default", "[locale]") REQUIRE( loc.Init(wxLANGUAGE_DEFAULT, wxLOCALE_DONT_LOAD_DEFAULT) ); } +#endif // wxUSE_UNICODE + #endif // wxUSE_INTL