X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cdd00f29f62c709af8de2f3cb817b224bced1a1..c7e99122a0f181d199be3ec6c3928109c2bdf76b:/tests/testprec.h?ds=sidebyside

diff --git a/tests/testprec.h b/tests/testprec.h
index 853a62644b..d956d4353a 100644
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -1,3 +1,6 @@
+#ifndef WX_TESTPREC_INCLUDED
+#define WX_TESTPREC_INCLUDED 1
+
 #include "wx/wxprec.h"
 #include "wx/cppunit.h"
 
@@ -26,6 +29,23 @@
     #endif
 #endif
 
+// Define wxUSING_VC_CRT_IO when using MSVC CRT STDIO library as its standard
+// functions give different results from glibc ones in several cases (of
+// course, any code relying on this is not portable and probably won't work,
+// i.e. will result in tests failures, with other platforms/compilers which
+// should have checks for them added as well).
+//
+// Notice that MinGW uses VC CRT by default but may use its own printf()
+// implementation if __USE_MINGW_ANSI_STDIO is defined. And finally also notice
+// that testing for __USE_MINGW_ANSI_STDIO directly results in a warning with
+// -Wundef if it involves an operation with undefined __MINGW_FEATURES__ so
+// test for the latter too to avoid it.
+#if defined(__VISUALC__) || \
+    (defined(__MINGW32__) && \
+     (!defined(__MINGW_FEATURES__) || !__USE_MINGW_ANSI_STDIO))
+    #define wxUSING_VC_CRT_IO
+#endif
+
 // thrown when assert fails in debug build
 class TestAssertFailure
 {
@@ -65,8 +85,12 @@ public:
                 CPPUNIT_FAIL("expected assertion not generated"); \
         }
 #else
-    // there are no assertions in this build so just check that it fails
-    #define WX_ASSERT_FAILS_WITH_ASSERT(cond) CPPUNIT_ASSERT(!(cond))
+    // there are no assertions in this build so we can't do anything (we used
+    // to check that the condition failed but this didn't work well as in
+    // normal build with wxDEBUG_LEVEL != 0 we can pass something not
+    // evaluating to a bool at all but it then would fail to compile in
+    // wxDEBUG_LEVEL == 0 case, so just don't do anything at all now).
+    #define WX_ASSERT_FAILS_WITH_ASSERT(cond)
 #endif
 
 // these functions can be used to hook into wxApp event processing and are
@@ -81,15 +105,26 @@ extern void SetProcessEventFunc(ProcessEventFunc func);
 
 extern bool IsNetworkAvailable();
 
-// helper class setting the locale to "C" for its lifetime
-class CLocaleSetter
+// Helper class setting the locale to the given one for its lifetime.
+class LocaleSetter
 {
 public:
-    CLocaleSetter() : m_locOld(setlocale(LC_ALL, "C")) { }
-    ~CLocaleSetter() { setlocale(LC_ALL, m_locOld); }
+    LocaleSetter(const char *loc) : m_locOld(setlocale(LC_ALL, loc)) { }
+    ~LocaleSetter() { setlocale(LC_ALL, m_locOld); }
 
 private:
     const char * const m_locOld;
+
+    wxDECLARE_NO_COPY_CLASS(LocaleSetter);
+};
+
+// An even simpler helper for setting the locale to "C" one during its lifetime.
+class CLocaleSetter : private LocaleSetter
+{
+public:
+    CLocaleSetter() : LocaleSetter("C") { }
+
+private:
     wxDECLARE_NO_COPY_CLASS(CLocaleSetter);
 };
 
@@ -109,3 +144,5 @@ private:
         CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterRegistry__ ); \
     static CPPUNIT_NS::AutoRegisterSuite< name##TestCase > \
         CPPUNIT_MAKE_UNIQUE_NAME( autoRegisterNamedRegistry__ )(#name "TestCase")
+
+#endif