From 62b88de2d21cdaa9d61fc4c8737eb4e58584bba1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 May 2013 15:10:53 +0000 Subject: [PATCH] Disable more wxAny tests under OS X to try to find the buildbot crash. Disabling wxVariantConversions test was not enough to fix the crash happening in OS X PPC build slave, so disable a few more of them. Temporarily do it for any wxOSX build, the run-time check for buildbot will be restored later when I finally manage to find the problematic test(s?). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/any/anytest.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp index e854a8299e..dc5fb4a7c8 100644 --- a/tests/any/anytest.cpp +++ b/tests/any/anytest.cpp @@ -37,10 +37,15 @@ private: CPPUNIT_TEST( Equality ); CPPUNIT_TEST( As ); CPPUNIT_TEST( GetAs ); + // FIXME: One of these tests might result in heap corruption under PPC + // OS X, disable them to at least allow the subsequent tests to + // run as otherwise the test program just crashes. +#ifdef __WXOSX__ CPPUNIT_TEST( Null ); CPPUNIT_TEST( wxVariantConversions ); CPPUNIT_TEST( CustomTemplateSpecialization ); CPPUNIT_TEST( Misc ); +#endif // __WXOSX__ CPPUNIT_TEST_SUITE_END(); void CheckType(); @@ -498,14 +503,6 @@ protected: void wxAnyTestCase::wxVariantConversions() { -#ifdef __WXOSX__ - // FIXME: This test might result in heap corruption under PPC OS X, disable - // it to at least allow the subsequent tests to run as otherwise the - // test program just crashes. - if ( IsAutomaticTest() ) - return; -#endif // __WXOSX__ - #if wxUSE_VARIANT // // Test various conversions to and from wxVariant -- 2.45.2