vcl/Module_vcl.mk | 6 ------ vcl/qa/cppunit/timer.cxx | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-)
New commits: commit f45183fcdef53237af6aff62211751c6b4f542c0 Author: Tor Lillqvist <t...@collabora.com> Date: Fri Aug 28 09:40:02 2015 +0300 Add a newline and fflush so that it actually shows up in the output Change-Id: Iea123118614ecf038883a0d51337042574ebc6b2 diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index 64a1ab9..1c08ff9 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -42,7 +42,8 @@ public: aWait.Seconds = mnSeconds; aWait.Nanosec = 1000000; // +1ms osl::Thread::wait( aWait ); - fprintf(stderr, "ERROR: WatchDog timer thread expired, failing the test!"); + fprintf(stderr, "ERROR: WatchDog timer thread expired, failing the test!\n"); + fflush(stderr); CPPUNIT_ASSERT_MESSAGE("watchdog triggered", false); } }; commit 6e8ec907dce656b81486889bf27489ad866cebd2 Author: Tor Lillqvist <t...@collabora.com> Date: Fri Aug 28 09:29:31 2015 +0300 CppunitTest_vcl_timer always fails on Windows for me Change-Id: I73f0771a09d3e74242b25922007c00ff77b37f8a diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index c949f42..4706bdb 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -124,10 +124,4 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ )) endif -# Is any configuration missing? -ifeq ($(OS),WNT) -$(eval $(call gb_Module_add_check_targets,vcl,\ - CppunitTest_vcl_timer \ -)) -endif # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits