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/classification.h | |
| 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/classification.h')
| -rw-r--r-- | test/validation/classification/classification.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/validation/classification/classification.h b/test/validation/classification/classification.h index de9c37e13..6a7e8a5ab 100644 --- a/test/validation/classification/classification.h +++ b/test/validation/classification/classification.h @@ -7,7 +7,7 @@ #ifndef _ODP_TEST_CLASSIFICATION_H_ #define _ODP_TEST_CLASSIFICATION_H_ -#include <CUnit/Basic.h> +#include <odp_cunit_common.h> #define SHM_PKT_NUM_BUFS 32 #define SHM_PKT_BUF_SIZE 1024 @@ -71,15 +71,15 @@ void classification_test_pktio_configure(void); void classification_test_pktio_test(void); /* test arrays: */ -extern CU_TestInfo classification_suite_basic[]; -extern CU_TestInfo classification_suite[]; +extern odp_testinfo_t classification_suite_basic[]; +extern odp_testinfo_t classification_suite[]; /* test array init/term functions: */ int classification_suite_init(void); int classification_suite_term(void); /* test registry: */ -extern CU_SuiteInfo classification_suites[]; +extern odp_suiteinfo_t classification_suites[]; /* main test program: */ int classification_main(void); |