Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FormatConverterTestCase for MinGW and Cygwin

Browse Source 
Standard/Unix format strings are intentionally used when using these
compilers/environments (see d62c535d4c for
the former), so don't check for Windows/MSVC format strings in the test.
This commit is contained in:
Vadim Zeitlin
2017-11-25 11:07:49 +01:00
parent 471a771382
commit b630abffd2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/formatconverter/formatconvertertest.cpp
View File

@@ -311,7 +311,9 @@ void FormatConverterTestCase::check(const wxString& input,
#if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY #if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY
result = (const wchar_t*)wxFormatString(input); result = (const wchar_t*)wxFormatString(input);
#ifdef __WINDOWS__ #if defined(__WINDOWS__) && \
!defined(__CYGWIN__) && \
!defined(__MINGW32__)
wxString expectedWchar(expectedWcharWindows); wxString expectedWchar(expectedWcharWindows);
#else #else
wxString expectedWchar(expectedWcharUnix); wxString expectedWchar(expectedWcharUnix);