[Libreoffice-commits] core.git: 2 commits - sd/CppunitTest_sd_misc_tests.mk vcl/source

[Stephan Bergmann (via logerrit)]

 sd/CppunitTest_sd_misc_tests.mk |    2 ++
 vcl/source/app/watchdog.cxx     |   13 +++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit d5fb841d2992fa44992d9a64de3407992661bab3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Feb 6 23:23:58 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Feb 7 09:12:32 2020 +0100

    Add missing test dependency on instdir/share/config/images_*.zip
    
    ...without which `make clean && make CppunitTest_sd_misc_tests` would fire
    
    > cppunittester: vcl/source/gdi/bmpacc.cxx:38: BitmapInfoAccess::BitmapInfoAccess(Bitmap &, BitmapAccessMode): Assertion `xImpBmp && "Forbidden Access to empty bitmap!"' failed.
    
    because
    
    > #3  0x00007ffff6deba66 in __GI___assert_fail
    > #4  0x00007fffd23c14af in BitmapInfoAccess::BitmapInfoAccess(Bitmap&, BitmapAccessMode) at vcl/source/gdi/bmpacc.cxx:38
    > #5  0x00007fffd23c36fc in BitmapReadAccess::BitmapReadAccess(Bitmap&, BitmapAccessMode) at vcl/source/gdi/bmpacc.cxx:87
    > #6  0x00007fffd23c89a0 in BitmapWriteAccess::BitmapWriteAccess(Bitmap&) at vcl/source/gdi/bmpacc.cxx:355
    > #7  0x00007fffd3359a02 in Bitmap::AcquireWriteAccess() at vcl/source/bitmap/bitmap.cxx:388
    > #8  0x00007fffd1cb15cf in vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &Bitmap::AcquireWriteAccess>::ScopedBitmapAccess(Bitmap&) at include/vcl/scopedbitmapaccess.hxx:53
    > #9  0x00007fffd3375fe6 in BitmapDisabledImageFilter::execute(BitmapEx const&) const at vcl/source/bitmap/BitmapDisabledImageFilter.cxx:28
    > #10 0x00007fffd336ed1d in BitmapFilter::Filter(BitmapEx&, BitmapFilter const&) at vcl/source/bitmap/bitmapfilter.cxx:22
    > #11 0x00007fffd34c1875 in ImplImage::getBitmapEx(bool) at vcl/source/image/ImplImage.cxx:123
    > #12 0x00007fffd34c212c in ImplImage::getBitmapExForHiDPI(bool) at vcl/source/image/ImplImage.cxx:153
    > #13 0x00007fffd34b3c7b in Image::Draw(OutputDevice*, Point const&, DrawImageFlags, Size const*) at vcl/source/image/Image.cxx:123
    > #14 0x00007fffd1cec66e in OutputDevice::DrawImage(Point const&, Size const&, Image const&, DrawImageFlags) at vcl/source/outdev/bitmap.cxx:1388
    > #15 0x00007fffd1cec1f7 in OutputDevice::DrawImage(Point const&, Image const&, DrawImageFlags) at vcl/source/outdev/bitmap.cxx:1372
    > #16 0x00007fffd0ea7ca4 in ToolBox::ImplDrawItem(OutputDevice&, unsigned long, unsigned short) at vcl/source/window/toolbox.cxx:2696
    > #17 0x00007fffd0ec629d in ToolBox::Paint(OutputDevice&, tools::Rectangle const&) at vcl/source/window/toolbox.cxx:3490
    > #18 0x00007fffd003daed in PaintHelper::DoPaint(vcl::Region const*) at vcl/source/window/paint.cxx:309
    
    wants to draw sfx2/res/symphony/morebutton.png
    
    Change-Id: I9c21eb7891a6dfa29033618177c97370695e413d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88146
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index fcc06fdb9a78..0d02125894c1 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -126,4 +126,6 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sd_misc_tests,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sd_misc_tests))
 
+$(call gb_CppunitTest_get_target,sd_misc_tests): $(call gb_Package_get_target,postprocess_images)
+
 # vim: set noet sw=4 ts=4:
commit d87d528257e1e289838b314d81393fe8bbe56126
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Feb 5 11:14:16 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Fri Feb 7 09:12:25 2020 +0100

    disable watchdog if using valgrind or debugger
    
    It generally shouldn't activate if the process is progressing slowly
    because of debugging.
    
    Change-Id: Iacabe0fee762d5bf292582fdbb1a8f5ce67abb5c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88010
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/source/app/watchdog.cxx b/vcl/source/app/watchdog.cxx
index c6c43e7e013b..795501ec45ac 100644
--- a/vcl/source/app/watchdog.cxx
+++ b/vcl/source/app/watchdog.cxx
@@ -15,10 +15,15 @@
 #include <rtl/ref.hxx>
 #include <rtl/string.hxx>
 #include <sal/log.hxx>
+#include <comphelper/debuggerinfo.hxx>
 #include <opengl/zone.hxx>
 
 #include <stdlib.h>
 
+#if defined HAVE_VALGRIND_HEADERS
+#include <valgrind/memcheck.h>
+#endif
+
 namespace
 {
 static volatile bool gbWatchdogFiring = false;
@@ -118,6 +123,14 @@ void WatchdogThread::start()
         return; // already running
     if (getenv("SAL_DISABLE_WATCHDOG"))
         return;
+#if defined HAVE_VALGRIND_HEADERS
+    if (RUNNING_ON_VALGRIND)
+        return;
+#endif
+#if defined DBG_UTIL
+    if (comphelper::isDebuggerAttached())
+        return;
+#endif
     gpWatchdogExit = new osl::Condition();
     gxWatchdog.set(new WatchdogThread());
     gxWatchdog->launch();