Whack-a-mole with wxOSX/PPC unit tests continued.

The problem was not related to float-to-double conversions in wxAny code, try
to narrow it even further.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index c746c30e5b05637e6aebeaabc44a6c8ed2b0591d..2a2c0bab9d470d68c0f0e305ab756958cae233c2 100644 (file)
--- a/tests/any/anytest.cpp
+++ b/tests/any/anytest.cpp
@@ -313,17 +313,10 @@ void wxAnyTestCase::GetAs()
     short int si = 0;
     unsigned long ul = 0;
     wxString s;
     short int si = 0;
     unsigned long ul = 0;
     wxString s;

-#if defined(__POWERPC__)
-    // FIXME: under wxOSX using float instead of double results in the heap
-    //        corruption, at least in the builds under PPC architecture for
-    //        some reason, disable them temporarily until this can be found.
-    double f = 0.0;
-#else

     // Let's test against float instead of double, since the former
     // is not the native underlying type the code converts to, but
     // should still work, all the same.
     float f = 0.0;
     // Let's test against float instead of double, since the former
     // is not the native underlying type the code converts to, but
     // should still work, all the same.
     float f = 0.0;

-#endif

     bool b = false;
 
     // Conversions from signed long type
     bool b = false;
 
     // Conversions from signed long type


@@ -363,7 +356,11 @@ void wxAnyTestCase::GetAs()
     // should not work.
     CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&l));
     CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&ul));
     // should not work.
     CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&l));
     CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&ul));

+    // FIXME: This statement results in heap corruption in wxOSX/PPC builds
+    //        for some unknown reason.
+#if !defined(__WXOSX__) || !defined(__POWERPC__)

     CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&f));
     CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&f));

+#endif // OSX/PPC

     CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&b));
 
     // Let's test some other conversions from string that should work.
     CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&b));
 
     // Let's test some other conversions from string that should work.