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

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-05-12 23:04:13 +00:00
parent dc8cd788c0
commit 99119b0e85
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/any/anytest.cpp
View File

@@ -313,17 +313,10 @@ void wxAnyTestCase::GetAs()
short int si = 0; short int si = 0;
unsigned long ul = 0; unsigned long ul = 0;
wxString s; 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 // Let's test against float instead of double, since the former
// is not the native underlying type the code converts to, but // is not the native underlying type the code converts to, but
// should still work, all the same. // should still work, all the same.
float f = 0.0; float f = 0.0;
#endif
bool b = false; bool b = false;
// Conversions from signed long type // Conversions from signed long type
@@ -363,7 +356,11 @@ void wxAnyTestCase::GetAs()
// should not work. // should not work.
CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&l)); CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&l));
CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&ul)); 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)); CPPUNIT_ASSERT(!m_anyStringString1.GetAs(&b));
// Let's test some other conversions from string that should work. // Let's test some other conversions from string that should work.