[Libreoffice-commits] core.git: vcl/qa

Michael Stahl mstahl at redhat.com
Thu Aug 27 13:05:29 PDT 2015


 vcl/qa/cppunit/timer.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2bef9a434bdf5c6185a72616874c61eae1a0e718
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Aug 27 22:01:21 2015 +0200

    vcl: print an error message in timer test watchdog
    
    The CPPUNIT_ASSERT will actually crash the process because in the
    spawned thread there is nothing to catch the exception, which means that
    when the watchdog triggered there is no indication why the test failed.
    
    Change-Id: Id7d2a99fe62326c817f100e0755679861cb37788

diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 76db8a8..64a1ab9 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -42,6 +42,7 @@ public:
         aWait.Seconds = mnSeconds;
         aWait.Nanosec = 1000000; // +1ms
         osl::Thread::wait( aWait );
+        fprintf(stderr, "ERROR: WatchDog timer thread expired, failing the test!");
         CPPUNIT_ASSERT_MESSAGE("watchdog triggered", false);
     }
 };


More information about the Libreoffice-commits mailing list