4 files changed, 17 insertions, 19 deletions
diff --git a/test/validation/crypto/crypto.c b/test/validation/crypto/crypto.c
index cad6601..b2f9d96 100644
--- a/test/validation/crypto/crypto.c
+++ b/test/validation/crypto/crypto.c
@@ -5,7 +5,7 @@
  */
 
 #include <odp.h>
-#include "odp_cunit_common.h"
+#include <odp_cunit_common.h>
 #include "odp_crypto_test_inp.h"
 #include "crypto.h"
 
@@ -15,12 +15,10 @@
 #define SHM_COMPL_POOL_SIZE	(128 * 1024)
 #define SHM_COMPL_POOL_BUF_SIZE	128
 
-CU_SuiteInfo crypto_suites[] = {
-	{ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, NULL, NULL, NULL,
-			crypto_suite},
-	{ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, NULL, NULL, NULL,
-			crypto_suite},
-	CU_SUITE_INFO_NULL,
+odp_suiteinfo_t crypto_suites[] = {
+	{ODP_CRYPTO_SYNC_INP, crypto_suite_sync_init, NULL, crypto_suite},
+	{ODP_CRYPTO_ASYNC_INP, crypto_suite_async_init, NULL, crypto_suite},
+	ODP_SUITE_INFO_NULL,
 };
 
 int crypto_init(void)
diff --git a/test/validation/crypto/crypto.h b/test/validation/crypto/crypto.h
index 41dd4ed..7cb60d4 100644
--- a/test/validation/crypto/crypto.h
+++ b/test/validation/crypto/crypto.h
@@ -7,7 +7,7 @@
 #ifndef _ODP_TEST_CRYPTO_H_
 #define _ODP_TEST_CRYPTO_H_
 
-#include <CUnit/Basic.h>
+#include "odp_cunit_common.h"
 
 /* test functions: */
 void crypto_test_enc_alg_3des_cbc(void);
@@ -17,14 +17,14 @@ void crypto_test_dec_alg_3des_cbc_ovr_iv(void);
 void crypto_test_alg_hmac_md5(void);
 
 /* test arrays: */
-extern CU_TestInfo crypto_suite[];
+extern odp_testinfo_t crypto_suite[];
 
 /* test array init/term functions: */
 int crypto_suite_sync_init(void);
 int crypto_suite_async_init(void);
 
 /* test registry: */
-extern CU_SuiteInfo crypto_suites[];
+extern odp_suiteinfo_t crypto_suites[];
 
 /* executable init/term functions: */
 int crypto_init(void);
diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/validation/crypto/odp_crypto_test_inp.c
index 187a04c..69325a4 100644
--- a/test/validation/crypto/odp_crypto_test_inp.c
+++ b/test/validation/crypto/odp_crypto_test_inp.c
@@ -319,11 +319,11 @@ int crypto_suite_async_init(void)
 	return 0;
 }
 
-CU_TestInfo crypto_suite[] = {
-	_CU_TEST_INFO(crypto_test_enc_alg_3des_cbc),
-	_CU_TEST_INFO(crypto_test_dec_alg_3des_cbc),
-	_CU_TEST_INFO(crypto_test_enc_alg_3des_cbc_ovr_iv),
-	_CU_TEST_INFO(crypto_test_dec_alg_3des_cbc_ovr_iv),
-	_CU_TEST_INFO(crypto_test_alg_hmac_md5),
-	CU_TEST_INFO_NULL,
+odp_testinfo_t crypto_suite[] = {
+	ODP_TEST_INFO(crypto_test_enc_alg_3des_cbc),
+	ODP_TEST_INFO(crypto_test_dec_alg_3des_cbc),
+	ODP_TEST_INFO(crypto_test_enc_alg_3des_cbc_ovr_iv),
+	ODP_TEST_INFO(crypto_test_dec_alg_3des_cbc_ovr_iv),
+	ODP_TEST_INFO(crypto_test_alg_hmac_md5),
+	ODP_TEST_INFO_NULL,
 };
diff --git a/test/validation/crypto/odp_crypto_test_inp.h b/test/validation/crypto/odp_crypto_test_inp.h
index d46994f..8bda344 100644
--- a/test/validation/crypto/odp_crypto_test_inp.h
+++ b/test/validation/crypto/odp_crypto_test_inp.h
@@ -6,14 +6,14 @@
 #ifndef ODP_CRYPTO_TEST_ASYNC_INP_
 #define ODP_CRYPTO_TEST_ASYNC_INP_
 
-#include "CUnit/TestDB.h"
+#include <odp_cunit_common.h>
 
 /* Suite names */
 #define ODP_CRYPTO_ASYNC_INP	"odp_crypto_async_inp"
 #define ODP_CRYPTO_SYNC_INP    "odp_crypto_sync_inp"
 
 /* Suite test array */
-extern CU_TestInfo crypto_suite[];
+extern odp_testinfo_t crypto_suite[];
 
 int crypto_suite_sync_init(void);
 int crypto_suite_async_init(void);