dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eina/tests: fix some warnings and use better ck macros. 

SVN revision: 82943
This commit is contained in:
Gustavo Sverzut Barbieri 2013-01-17 19:13:24 +00:00
parent 88f2d26608
commit 94f2f63228
2 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/tests/eina/eina_test_barrier.c
View File

@ -61,23 +61,49 @@ wk3_func(void *data EINA_UNUSED, Eina_Thread thread EINA_UNUSED)
START_TEST(eina_barrier_test_simple)
{
eina_init();
eina_threads_init();
Eina_Bool r;
int i;
eina_barrier_new(&barrier, 6);
eina_thread_create(&wk1, EINA_THREAD_NORMAL, 0, wk_func, NULL);
eina_thread_create(&wk2, EINA_THREAD_NORMAL, 0, wk_func, NULL);
eina_thread_create(&wk3, EINA_THREAD_NORMAL, 0, wk1_func, NULL);
eina_thread_create(&wk4, EINA_THREAD_NORMAL, 0, wk2_func, NULL);
eina_thread_create(&wk5, EINA_THREAD_NORMAL, 0, wk3_func, NULL);
i = eina_init();
ck_assert_int_ge(i, 1);
i = eina_threads_init();
ck_assert_int_ge(i, 1);
r = eina_barrier_new(&barrier, 6);
fail_unless(r);
r = eina_thread_create(&wk1, EINA_THREAD_NORMAL, 0, wk_func, NULL);
fail_unless(r);
r = eina_thread_create(&wk2, EINA_THREAD_NORMAL, 0, wk_func, NULL);
fail_unless(r);
r = eina_thread_create(&wk3, EINA_THREAD_NORMAL, 0, wk1_func, NULL);
fail_unless(r);
r = eina_thread_create(&wk4, EINA_THREAD_NORMAL, 0, wk2_func, NULL);
fail_unless(r);
r = eina_thread_create(&wk5, EINA_THREAD_NORMAL, 0, wk3_func, NULL);
fail_unless(r);
eina_barrier_wait(&barrier);
eina_thread_join(wk1);
ck_assert_int_eq(eina_error_get(), 0);
eina_thread_join(wk2);
ck_assert_int_eq(eina_error_get(), 0);
eina_thread_join(wk3);
ck_assert_int_eq(eina_error_get(), 0);
eina_thread_join(wk4);
ck_assert_int_eq(eina_error_get(), 0);
eina_thread_join(wk5);
ck_assert_int_eq(eina_error_get(), 0);
eina_barrier_free(&barrier);

13
src/tests/eina/eina_test_sched.c
View File

@ -43,7 +43,10 @@ _thread_run(void *arg EINA_UNUSED, Eina_Thread tid EINA_UNUSED)
eina_sched_prio_drop();
niceval2 = getpriority(PRIO_PROCESS, 0);
fail_if((niceval2 != 19) && (niceval2 != niceval+5));
if (niceval + 5 >= 19)
ck_assert_int_eq(niceval2, 19);
else
ck_assert_int_eq(niceval2, (niceval + 5));
return NULL;
}
@ -53,18 +56,20 @@ START_TEST(eina_test_sched_prio_drop)
int niceval = getpriority(PRIO_PROCESS, 0);
int niceval2;
Eina_Thread tid;
Eina_Bool r;
eina_init();
eina_thread_create(&tid, EINA_THREAD_NORMAL, -1, _thread_run, NULL);
r = eina_thread_create(&tid, EINA_THREAD_NORMAL, -1, _thread_run, NULL);
fail_unless(r);
niceval2 = getpriority(PRIO_PROCESS, 0);
/* niceness of main thread should not have changed */
fail_if(niceval2 != niceval);
ck_assert_int_eq(niceval2, niceval);
eina_thread_join(tid);
/* niceness of main thread should not have changed */
fail_if(niceval2 != niceval);
ck_assert_int_eq(niceval2, niceval);
eina_shutdown();
}