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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Thu Jun 16 01:46:41 UTC 2016


 comphelper/qa/unit/threadpooltest.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ab13873ebb6dc4738be2e2184ee4433a2447c1d
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed Jun 15 21:11:34 2016 -0400

    Expect fewer than MAX_CONCURRENCY threads in test
    
    Change-Id: I4346b6d79b46bccb5b79e27744c3cf80aa88fc9a
    Reviewed-on: https://gerrit.libreoffice.org/26344
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/comphelper/qa/unit/threadpooltest.cxx b/comphelper/qa/unit/threadpooltest.cxx
index a90d5b0..388dffa 100644
--- a/comphelper/qa/unit/threadpooltest.cxx
+++ b/comphelper/qa/unit/threadpooltest.cxx
@@ -31,7 +31,7 @@ void ThreadPoolTest::testPreferredConcurrency() {
     // Check default.
     auto nThreads = comphelper::ThreadPool::getPreferredConcurrency();
     sal_Int32 nExpected = 4; // UTs are capped to 4.
-    CPPUNIT_ASSERT_EQUAL(nExpected, nThreads);
+    CPPUNIT_ASSERT_MESSAGE("Expected no more than 4 threads", nExpected >= nThreads);
 
 #ifndef _WIN32_WINNT
     // The result should be cached, so this should change anything.


More information about the Libreoffice-commits mailing list