Applied patch #15540: wxRichTextTable: crashes due to an invalid focus object (dghart)

[wxWidgets.git] / tests / events / timertest.cpp

diff --git a/tests/events/timertest.cpp b/tests/events/timertest.cpp
index 48553a271a3dd84dda0c72f233cc5eeb4cde9363..953977a23034b07b6fbe68a2eec7d2a8bccadba6 100644 (file)
--- a/tests/events/timertest.cpp
+++ b/tests/events/timertest.cpp
@@ -3,7 +3,6 @@
 // Purpose:     Test wxTimer events
 // Author:      Vadim Zeitlin
 // Created:     2008-10-22
-// RCS-ID:      $Id$
 // Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -25,7 +24,10 @@
 #include "wx/evtloop.h"
 #include "wx/timer.h"
 
+// --------------------------------------------------------------------------
 // helper class counting the number of timer events
+// --------------------------------------------------------------------------
+
 class TimerCounterHandler : public wxEvtHandler
 {
 public:
@@ -77,7 +79,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( TimerEventTestCase );
 
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TimerEventTestCase, "TimerEventTestCase" );
 
 void TimerEventTestCase::OneShot()
@@ -112,6 +114,10 @@ void TimerEventTestCase::OneShot()
 
 void TimerEventTestCase::Multiple()
 {
+    // FIXME: This test crashes on wxGTK ANSI build slave for unknown reason,
+    //        disable it here to let the rest of the test suite run until this
+    //        can be fixed.
+#if !defined(__WXGTK__) || wxUSE_UNICODE
     wxEventLoop loop;
 
     TimerCounterHandler handler;
@@ -137,4 +143,5 @@ void TimerEventTestCase::Multiple()
     // parallel actually) it may be much less than 20 so just check that we get
     // more than one
     CPPUNIT_ASSERT( numTicks > 1 );
+#endif // !(wxGTK Unicode)
 }