Fixed heap corruption when reading a corrupted RLE TGA image.

[wxWidgets.git] / tests / fswatcher / fswatchertest.cpp

diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp
index 306049f73e7954c64bc87ea4cc029f8b646ff9bc..bc7ff966bfc70db8197602edb5fd6b9e24d3a055 100644 (file)
--- a/tests/fswatcher/fswatchertest.cpp
+++ b/tests/fswatcher/fswatchertest.cpp
@@ -329,18 +329,21 @@ public:
     {
         CPPUNIT_ASSERT_MESSAGE( "No events received", !m_events.empty() );
 
+        const wxFileSystemWatcherEvent * const e = m_events.front();
+
         WX_ASSERT_EQUAL_MESSAGE
         (
             (
-                "Extra event received, last has type=%x, path=\"%s\"",
+                "Extra events received, first is of type %x, for path=\"%s\","
+                "last is of type %x, path=\"%s\"",
+                e->GetChangeType(),
+                e->GetPath().GetFullPath(),
                 m_events.back()->GetChangeType(),
                 m_events.back()->GetPath().GetFullPath()
             ),
             1, m_events.size()
         );
 
-        const wxFileSystemWatcherEvent * const e = m_events.front();
-
         // this is our "reference event"
         const wxFileSystemWatcherEvent expected = ExpectedEvent();
 
@@ -422,8 +425,15 @@ private:
     DECLARE_NO_COPY_CLASS(FileSystemWatcherTestCase)
 };
 
+// the test currently hangs under OS X for some reason and this prevents tests
+// ran by buildbot from completing so disable it until someone has time to
+// debug it
+//
+// FIXME: debug and fix this!
+#ifndef __WXOSX__
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( FileSystemWatcherTestCase );
+#endif
 
 // also include in it's own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FileSystemWatcherTestCase,