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/classification/odp_classification_tests.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/classification/odp_classification_tests.c')
| -rw-r--r-- | test/validation/classification/odp_classification_tests.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/validation/classification/odp_classification_tests.c b/test/validation/classification/odp_classification_tests.c index 03a855e5b..7dba8effb 100644 --- a/test/validation/classification/odp_classification_tests.c +++ b/test/validation/classification/odp_classification_tests.c @@ -643,12 +643,12 @@ void classification_test_pktio_test(void) test_pktio_pmr_match_set_cos(); } -CU_TestInfo classification_suite[] = { - _CU_TEST_INFO(classification_test_pmr_terms_avail), - _CU_TEST_INFO(classification_test_pktio_set_skip), - _CU_TEST_INFO(classification_test_pktio_set_headroom), - _CU_TEST_INFO(classification_test_pmr_terms_cap), - _CU_TEST_INFO(classification_test_pktio_configure), - _CU_TEST_INFO(classification_test_pktio_test), - CU_TEST_INFO_NULL, +odp_testinfo_t classification_suite[] = { + ODP_TEST_INFO(classification_test_pmr_terms_avail), + ODP_TEST_INFO(classification_test_pktio_set_skip), + ODP_TEST_INFO(classification_test_pktio_set_headroom), + ODP_TEST_INFO(classification_test_pmr_terms_cap), + ODP_TEST_INFO(classification_test_pktio_configure), + ODP_TEST_INFO(classification_test_pktio_test), + ODP_TEST_INFO_NULL, }; |