diff options
author | Zoltan Kiss <zoltan.kiss@linaro.org> | 2015-11-03 15:26:06 +0000 |
---|---|---|
committer | Zoltan Kiss <zoltan.kiss@linaro.org> | 2015-11-03 15:53:59 +0000 |
commit | f8c6fcc8e510f1ba7c0c258e13a994dc5836933e (patch) | |
tree | 84d252edd371f2e4fb0c10225daf8ec9dcd833b3 /test/validation/errno/errno.h | |
parent | d8bceaec15a1ca37cd23d420b1f285c94e5736fc (diff) | |
parent | fdcd79c00c5c493106a532e29f680cf89c188d05 (diff) |
Merge branch 'master' of https://git.linaro.org/lng/odp to 1.4.0.0
Merging commits from mainline odp.git master branch, up until fdcd79c0 "test:
l2fwd: separate rx and tx drop counters"
Conflicts:
configure.ac
test/validation/Makefile.am
Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
Diffstat (limited to 'test/validation/errno/errno.h')
-rw-r--r-- | test/validation/errno/errno.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/validation/errno/errno.h b/test/validation/errno/errno.h index 374a3c96a..3e217b5d4 100644 --- a/test/validation/errno/errno.h +++ b/test/validation/errno/errno.h @@ -7,16 +7,16 @@ #ifndef _ODP_TEST_ERRNO_H_ #define _ODP_TEST_ERRNO_H_ -#include <CUnit/Basic.h> +#include <odp_cunit_common.h> /* test functions: */ void errno_test_odp_errno_sunny_day(void); /* test arrays: */ -extern CU_TestInfo errno_suite[]; +extern odp_testinfo_t errno_suite[]; /* test registry: */ -extern CU_SuiteInfo errno_suites[]; +extern odp_suiteinfo_t errno_suites[]; /* main test program: */ int errno_main(void); |