dbaccess/qa/unit/SingleSelectQueryComposer_test.cxx | 12 ++++++++++++
sal/rtl/math.cxx | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit e7b352e023110876f2e47c2b12319c3683f12b1d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 27 14:42:23 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 27 15:51:55 2025 +0100
remove volatile from variable in rtl_math_acosh
which does nothing useful here.
was introduced in
commit f70de5267d7d9b7b6946cd72fe26e91bb6ac8431
Author: Kurt Zenker <k...@openoffice.org>
Date: Fri Sep 11 18:55:06 2009 +0000
CWS-TOOLING: integrate CWS odff06
Change-Id: I7a626296db7ac7588cc114db6578e05408d59de3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183392
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 49b38d6e74c7..26b539a9cc8c 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -702,7 +702,7 @@ double SAL_CALL rtl_math_asinh(double fX) noexcept
*/
double SAL_CALL rtl_math_acosh(double fX) noexcept
{
- volatile double fZ = fX - 1.0;
+ double fZ = fX - 1.0;
if (fX < 1.0)
return std::numeric_limits<double>::quiet_NaN();
if (fX == 1.0)
commit c02c75ba1e748ee72f299464fc6cf34f9ddc9298
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 27 14:28:02 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 27 15:51:44 2025 +0100
fix CppunitTest_dbaccess_SingleSelectQueryComposer_test deadlock
I have seen several deadlocks on jenkins in this unit test, normally
with stacks like
privateSnippetExecutor ()
connectivity::hsqldb::OHsqlConnection::flush()
connectivity::hsqldb::ODriverDelegator::flushConnections()
connectivity::hsqldb::OConnectionController::queryTermination
framework::Desktop::impl_sendQueryTerminationEvent
framework::Desktop::terminate()
(anonymous namespace)::Hook::deinitHook((anonymous namespace)::Hook*,
LinkParamNone*)
(anonymous namespace)::Hook::LinkStubdeinitHook(void*, LinkParamNone*)
Link<LinkParamNone*, void>::Call(LinkParamNone*) const
in DeInitVCL()
Implement a proper teardown in the unit test so this does not happen.
Change-Id: I3242752dc38d74128fcd134fe7391f04bd64ebc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183391
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/qa/unit/SingleSelectQueryComposer_test.cxx
b/dbaccess/qa/unit/SingleSelectQueryComposer_test.cxx
index 81ecc06fe13a..fab287ce7a62 100644
--- a/dbaccess/qa/unit/SingleSelectQueryComposer_test.cxx
+++ b/dbaccess/qa/unit/SingleSelectQueryComposer_test.cxx
@@ -41,6 +41,7 @@ class SingleSelectQueryComposerTest : public DBTestBase
public:
virtual void setUp() override;
+ virtual void tearDown() override;
void testSetCommand();
void testAttributes();
void testSubQueries();
@@ -83,6 +84,17 @@ void SingleSelectQueryComposerTest::setUp()
m_xComposer = xComposer;
}
+void SingleSelectQueryComposerTest::tearDown()
+{
+ m_xComposer.clear();
+ if (m_xConnection)
+ {
+ m_xConnection->close();
+ m_xConnection.clear();
+ }
+ DBTestBase::tearDown();
+}
+
// tests setCommand of the composer
void SingleSelectQueryComposerTest::testSetCommand()
