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

[Caolán McNamara]

 vcl/qa/cppunit/timer.cxx               |    3 ++-
 vcl/source/uitest/uno/uiobject_uno.cxx |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6814b7e20d96d334189dbc6c74b46b85977ce091
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 15 15:47:01 2017 +0100

    coverity#1415093 annotate Waiting while holding a lock as deliberate
    
    Change-Id: I88146737b1a1480c9ed1207896b0343dc982784a

diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index 938161a3af03..d6f8afb5caea 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -100,6 +100,7 @@ IMPL_LINK_NOARG(ExecuteWrapper, ExecuteActionHdl, Timer*, void)
         std::unique_lock<std::mutex> lock(mMutex);
         while (!mbSignal)
         {
+            // coverity[blocks] - intentional sleep while mutex held
             std::this_thread::sleep_for(std::chrono::milliseconds(5));
         }
     }
commit 1db9b9e5854c3ad8095fe9a41033a26e450188ab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 15 15:39:10 2017 +0100

    coverity#1415095 annotate Infinite loop as false positive
    
    Change-Id: I030a6bee3864e758177ce73b678ba22cd10ec217

diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index c1f14ced5c38..3b28f56f4cda 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -319,7 +319,8 @@ void TimerTest::testAutoTimerStop()
     sal_Int32 nTimerCount = 0;
     const sal_Int32 nMaxCount = 5;
     AutoTimerCount aAutoTimer( 0, nTimerCount, nMaxCount );
-    while ( nMaxCount != nTimerCount )
+    // coverity[loop_top] - Application::Yield allows the timer to fire and increment TimerCount
+    while (nMaxCount != nTimerCount)
         Application::Yield();
     CPPUNIT_ASSERT( !aAutoTimer.IsActive() );
     CPPUNIT_ASSERT( !Application::Reschedule() );