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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Thu Jun 16 05:03:10 UTC 2016


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

New commits:
commit 875c553f5d5f5d2329bf40b1b39118259ec6a93b
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Jun 16 01:01:45 2016 -0400

    Expect fewer than MAX_CONCURRENCY threads in test (2)
    
    Change-Id: I895ae4dea12e66fcbd0f4635c6ba5915d0431187
    Reviewed-on: https://gerrit.libreoffice.org/26346
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/comphelper/qa/unit/threadpooltest.cxx b/comphelper/qa/unit/threadpooltest.cxx
index 388dffa..d71a111 100644
--- a/comphelper/qa/unit/threadpooltest.cxx
+++ b/comphelper/qa/unit/threadpooltest.cxx
@@ -44,7 +44,7 @@ void ThreadPoolTest::testPreferredConcurrency() {
     // Revert and check. Again, nothing should change.
     unsetenv("MAX_CONCURRENCY");
     nThreads = comphelper::ThreadPool::getPreferredConcurrency();
-    CPPUNIT_ASSERT_EQUAL(nExpected, nThreads);
+    CPPUNIT_ASSERT_MESSAGE("Expected no more than 4 threads", nExpected >= nThreads);
 #endif
 }
 


More information about the Libreoffice-commits mailing list