From: Razvan Becheriu <razvan.becheriu@qualitance.com>
Date: Tue, 30 Jan 2018 14:42:16 +0000 (+0200)
Subject: Merge branch 'master' into HEAD
X-Git-Tag: trac5524_base~16^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64870d562636d10d607f4972e68fe385ffc61b56;p=thirdparty%2Fkea.git

Merge branch 'master' into HEAD
---

64870d562636d10d607f4972e68fe385ffc61b56
diff --cc src/lib/cryptolink/tests/run_unittests.cc
index 6c92b190ca,9f3b06f39c..b2e8e4fccc
--- a/src/lib/cryptolink/tests/run_unittests.cc
+++ b/src/lib/cryptolink/tests/run_unittests.cc
@@@ -4,7 -4,7 +4,8 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
+ #include <config.h>
 +#include <gtest/gtest.h>
  
  #include <log/logger_support.h>
  #include <util/unittests/run_all.h>
diff --cc src/lib/util/threads/tests/condvar_unittest.cc
index 40013d93ff,2921713365..80b2472743
--- a/src/lib/util/threads/tests/condvar_unittest.cc
+++ b/src/lib/util/threads/tests/condvar_unittest.cc
@@@ -134,11 -134,15 +134,13 @@@ signalAndWait(CondVar* condvar, Mutex* 
      condvar->wait(*mutex);
  }
  
 -TEST_F(CondVarTest,
  #ifdef HAS_UNDEFINED_PTHREAD_BEHAVIOR
 -       DISABLED_destroyWhileWait
 +TEST_F(CondVarTest, DISABLED_destroyWhileWait) {
  #else
- TEST_F(CondVarTest, destroyWhileWait) {
+ // This tests had to be disabled because it hangs on most of the OS used in lab
+ // TODO fix destroyWhileWait test
 -       DISABLED_destroyWhileWait
++TEST_F(CondVarTest, DISABLED_destroyWhileWait) {
  #endif
 -) {
      // We'll destroy a CondVar object while the thread is still waiting
      // on it.  This will trigger an assertion failure.
      if (!isc::util::unittests::runningOnValgrind()) {