From b630abffd2890b86de5dd49b0bbb1bd4f458955c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Nov 2017 11:07:49 +0100
Subject: [PATCH] Fix FormatConverterTestCase for MinGW and Cygwin

Standard/Unix format strings are intentionally used when using these
compilers/environments (see d62c535d4cadf9793f9639d1449c172e996430f3 for
the former), so don't check for Windows/MSVC format strings in the test.
---
 tests/formatconverter/formatconvertertest.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/formatconverter/formatconvertertest.cpp b/tests/formatconverter/formatconvertertest.cpp
index 4ad9180a0b..187fa30248 100644
--- a/tests/formatconverter/formatconvertertest.cpp
+++ b/tests/formatconverter/formatconvertertest.cpp
@@ -311,7 +311,9 @@ void FormatConverterTestCase::check(const wxString& input,
 #if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY
     result = (const wchar_t*)wxFormatString(input);
 
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && \
+    !defined(__CYGWIN__) && \
+    !defined(__MINGW32__)
     wxString expectedWchar(expectedWcharWindows);
 #else
     wxString expectedWchar(expectedWcharUnix);