From 9806a809220a3fd47a91519a2ca152cfb7a31f66 Mon Sep 17 00:00:00 2001 From: Bjoern Petri Date: Sun, 18 Oct 2015 20:05:09 +0200 Subject: [PATCH] CELIX-263: fixed wrong constants used in celix_thread_test --- utils/private/test/celix_threads_test.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/private/test/celix_threads_test.cpp b/utils/private/test/celix_threads_test.cpp index d5a01b406..6d62bad92 100644 --- a/utils/private/test/celix_threads_test.cpp +++ b/utils/private/test/celix_threads_test.cpp @@ -172,6 +172,9 @@ TEST(celix_thread_mutex, lock) { //possible race condition, not perfect test celixThreadMutex_unlock(¶ms->mu); + + sleep(2); + celixThreadMutex_lock(¶ms->mu2); LONGS_EQUAL(666, params->i); celixThreadMutex_unlock(¶ms->mu2); @@ -191,14 +194,14 @@ TEST(celix_thread_mutex, attrSettype) { celixThreadMutexAttr_create(&mu_attr); //test recursive mutex - celixThreadMutexAttr_settype(&mu_attr, PTHREAD_MUTEX_RECURSIVE); + celixThreadMutexAttr_settype(&mu_attr, CELIX_THREAD_MUTEX_RECURSIVE); celixThreadMutex_create(&mu, &mu_attr); //if program doesnt deadlock: succes! also check factorial of 10, for reasons unknown LONGS_EQUAL(3628800, thread_test_func_recur_lock(&mu, 10)); celixThreadMutex_destroy(&mu); //test deadlock check mutex - celixThreadMutexAttr_settype(&mu_attr, PTHREAD_MUTEX_ERRORCHECK); + celixThreadMutexAttr_settype(&mu_attr, CELIX_THREAD_MUTEX_ERRORCHECK); celixThreadMutex_create(&mu, &mu_attr); //get deadlock error celixThreadMutex_lock(&mu);