From: Lokesh B V Date: Mon, 14 Aug 2017 13:28:42 +0000 (+0530) Subject: Fix for tc build error when CONFIG_PTHREAD_MUTEX_TYPES is disabled X-Git-Tag: 1.1_Public_Release~348^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97cfa856e890583b2d803cd36cdaf9150327d461;p=rtos%2Ftinyara.git Fix for tc build error when CONFIG_PTHREAD_MUTEX_TYPES is disabled This patch wrap the recursive mutex tc code snippet with CONFIG_PTHREAD_MUTEX_TYPES as recursive mutex needs CONFIG_PTHREAD_MUTEX_TYPES enabled. and removes unnecessary condition check in kernel_tc_main. Signed-off-by: Lokesh B V --- diff --git a/apps/examples/testcase/le_tc/kernel/kernel_tc_main.c b/apps/examples/testcase/le_tc/kernel/kernel_tc_main.c index 5243de8..59a3a4b 100644 --- a/apps/examples/testcase/le_tc/kernel/kernel_tc_main.c +++ b/apps/examples/testcase/le_tc/kernel/kernel_tc_main.c @@ -99,9 +99,6 @@ int kernel_tc_main(int argc, char *argv[]) #endif #ifdef CONFIG_TC_KERNEL_LIBC_PTHREAD -#if (!defined CONFIG_PTHREAD_MUTEX_TYPES) -#error CONFIG_PTHREAD_MUTEX_TYPES is needed for testing LIBC_PTHREAD TC -#endif libc_pthread_main(); #endif @@ -160,9 +157,6 @@ int kernel_tc_main(int argc, char *argv[]) #endif #ifdef CONFIG_TC_KERNEL_PTHREAD -#if (!defined CONFIG_PTHREAD_MUTEX_TYPES) -#error CONFIG_PTHREAD_MUTEX_TYPES is needed for testing PTHREAD TC -#endif pthread_main(); #endif diff --git a/apps/examples/testcase/le_tc/kernel/tc_pthread.c b/apps/examples/testcase/le_tc/kernel/tc_pthread.c index b1a3031..3541fb3 100644 --- a/apps/examples/testcase/le_tc/kernel/tc_pthread.c +++ b/apps/examples/testcase/le_tc/kernel/tc_pthread.c @@ -1028,6 +1028,7 @@ static void tc_pthread_pthread_mutex_lock_unlock_trylock(void) sleep(SEC_2); +#ifdef CONFIG_PTHREAD_MUTEX_TYPES /* initalize mutex with PTHREAD_MUTEX_RECURSIVE attribute */ pthread_mutex_init(&g_mutex, &attr); @@ -1042,6 +1043,7 @@ static void tc_pthread_pthread_mutex_lock_unlock_trylock(void) ret_chk = pthread_mutex_unlock(&g_mutex); TC_ASSERT_EQ("pthread_mutex_unlock", ret_chk, OK); +#endif /* mutex_lock mutex_unlock check through multi threads */ g_mutex_cnt = 0;