diff options
| author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-10-26 16:48:07 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-10-26 17:29:47 +0300 |
| commit | 05e6b05273ba07ee3ab8e48f55a2cc972287cb2c (patch) | |
| tree | 666ab0d0b1c850b525806ecec3a35b9292f22455 /test/validation/thread/thread.c | |
| parent | 00af9c28e62d8eeea4f769c9e4b4a74184616086 (diff) | |
| parent | 78872639460a3f454fa69a72f7ea5ab4c547a2b8 (diff) | |
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Conflicts:
example/classifier/odp_classifier.c
include/odp/api/config.h
include/odp/api/cpu.h
include/odp/api/cpumask.h
include/odp/api/packet_io.h
platform/linux-generic/Makefile.am
platform/linux-generic/arch/linux/odp_cpu_cycles.c
test/performance/odp_scheduling.c
test/validation/classification/odp_classification_testsuites.h
test/validation/system/system.c
Diffstat (limited to 'test/validation/thread/thread.c')
| -rw-r--r-- | test/validation/thread/thread.c | 55 |
1 files changed, 30 insertions, 25 deletions
diff --git a/test/validation/thread/thread.c b/test/validation/thread/thread.c index 093e68802..03bf3cd2d 100644 --- a/test/validation/thread/thread.c +++ b/test/validation/thread/thread.c @@ -95,35 +95,40 @@ void thread_test_odp_thrmask_control(void) CU_ASSERT(ret == 1); } -CU_TestInfo thread_suite[] = { - _CU_TEST_INFO(thread_test_odp_cpu_id), - _CU_TEST_INFO(thread_test_odp_thread_id), - _CU_TEST_INFO(thread_test_odp_thread_count), - _CU_TEST_INFO(thread_test_odp_thrmask_to_from_str), - _CU_TEST_INFO(thread_test_odp_thrmask_equal), - _CU_TEST_INFO(thread_test_odp_thrmask_zero), - _CU_TEST_INFO(thread_test_odp_thrmask_set), - _CU_TEST_INFO(thread_test_odp_thrmask_clr), - _CU_TEST_INFO(thread_test_odp_thrmask_isset), - _CU_TEST_INFO(thread_test_odp_thrmask_count), - _CU_TEST_INFO(thread_test_odp_thrmask_and), - _CU_TEST_INFO(thread_test_odp_thrmask_or), - _CU_TEST_INFO(thread_test_odp_thrmask_xor), - _CU_TEST_INFO(thread_test_odp_thrmask_copy), - _CU_TEST_INFO(thread_test_odp_thrmask_first), - _CU_TEST_INFO(thread_test_odp_thrmask_last), - _CU_TEST_INFO(thread_test_odp_thrmask_next), - _CU_TEST_INFO(thread_test_odp_thrmask_worker), - _CU_TEST_INFO(thread_test_odp_thrmask_control), - CU_TEST_INFO_NULL, +odp_testinfo_t thread_suite[] = { + ODP_TEST_INFO(thread_test_odp_cpu_id), + ODP_TEST_INFO(thread_test_odp_thread_id), + ODP_TEST_INFO(thread_test_odp_thread_count), + ODP_TEST_INFO(thread_test_odp_thrmask_to_from_str), + ODP_TEST_INFO(thread_test_odp_thrmask_equal), + ODP_TEST_INFO(thread_test_odp_thrmask_zero), + ODP_TEST_INFO(thread_test_odp_thrmask_set), + ODP_TEST_INFO(thread_test_odp_thrmask_clr), + ODP_TEST_INFO(thread_test_odp_thrmask_isset), + ODP_TEST_INFO(thread_test_odp_thrmask_count), + ODP_TEST_INFO(thread_test_odp_thrmask_and), + ODP_TEST_INFO(thread_test_odp_thrmask_or), + ODP_TEST_INFO(thread_test_odp_thrmask_xor), + ODP_TEST_INFO(thread_test_odp_thrmask_copy), + ODP_TEST_INFO(thread_test_odp_thrmask_first), + ODP_TEST_INFO(thread_test_odp_thrmask_last), + ODP_TEST_INFO(thread_test_odp_thrmask_next), + ODP_TEST_INFO(thread_test_odp_thrmask_worker), + ODP_TEST_INFO(thread_test_odp_thrmask_control), + ODP_TEST_INFO_NULL, }; -CU_SuiteInfo thread_suites[] = { - {"thread", NULL, NULL, NULL, NULL, thread_suite}, - CU_SUITE_INFO_NULL, +odp_suiteinfo_t thread_suites[] = { + {"thread", NULL, NULL, thread_suite}, + ODP_SUITE_INFO_NULL, }; int thread_main(void) { - return odp_cunit_run(thread_suites); + int ret = odp_cunit_register(thread_suites); + + if (ret == 0) + ret = odp_cunit_run(); + + return ret; } |