From 98c68150edf07623bd713eacae1d4aa5678fbf24 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Sep 2014 17:44:45 +0000 Subject: [PATCH] no changes, add more specific description of these tests. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/controls/dialogtest.cpp | 5 +++-- tests/events/propagation.cpp | 6 +++++- tests/exec/exec.cpp | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/controls/dialogtest.cpp b/tests/controls/dialogtest.cpp index 2bd2a7cac2..be852910b6 100644 --- a/tests/controls/dialogtest.cpp +++ b/tests/controls/dialogtest.cpp @@ -29,8 +29,9 @@ public: private: CPPUNIT_TEST_SUITE( ModalDialogsTestCase ); -// FIXME: this test will cause test_gui segmentation fault. Disable it for now. -#if !defined(__WXUNIVERSAL__) && !defined (__WXX11__) +// wxInfoBar has bug under x11. It will cause the dialog crash +// Disable it for now. +#if !defined (__WXX11__) CPPUNIT_TEST( MessageDialog ); #endif CPPUNIT_TEST( FileDialog ); diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp index a1c3a2a874..20cb000f2a 100644 --- a/tests/events/propagation.cpp +++ b/tests/events/propagation.cpp @@ -241,7 +241,11 @@ private: CPPUNIT_TEST( ForwardEvent ); CPPUNIT_TEST( ScrollWindowWithoutHandler ); CPPUNIT_TEST( ScrollWindowWithHandler ); - //CPPUNIT_TEST( MenuEvent ); +// for unknown reason, this test will cause the tests segmentation failed +// under x11, disable it for now. +#if !defined (__WXX11__) + CPPUNIT_TEST( MenuEvent ); +#endif CPPUNIT_TEST( DocView ); WXUISIM_TEST( ContextMenuEvent ); CPPUNIT_TEST_SUITE_END(); diff --git a/tests/exec/exec.cpp b/tests/exec/exec.cpp index a547500cd6..ed27f04d74 100644 --- a/tests/exec/exec.cpp +++ b/tests/exec/exec.cpp @@ -68,8 +68,9 @@ public: private: CPPUNIT_TEST_SUITE( ExecTestCase ); -// FIXME: this test will cause test_gui segmentation fault. Disable it for now. -#if !defined(__WXUNIVERSAL__) && !defined (__WXX11__) +// wxX11 didn't implement some required features. Disable these tests +// for now. +#if !defined (__WXX11__) CPPUNIT_TEST( TestShell ); CPPUNIT_TEST( TestExecute ); CPPUNIT_TEST( TestProcess );