2 files changed, 47 insertions, 47 deletions
diff --git a/test/validation/synchronizers/synchronizers.c b/test/validation/synchronizers/synchronizers.c
index 6cb3699..49b7dad 100644
--- a/test/validation/synchronizers/synchronizers.c
+++ b/test/validation/synchronizers/synchronizers.c
@@ -942,10 +942,10 @@ void synchronizers_test_barrier_functional(void)
 	odp_cunit_thread_exit(&arg);
 }
 
-CU_TestInfo synchronizers_suite_barrier[] = {
-	_CU_TEST_INFO(synchronizers_test_no_barrier_functional),
-	_CU_TEST_INFO(synchronizers_test_barrier_functional),
-	CU_TEST_INFO_NULL
+odp_testinfo_t synchronizers_suite_barrier[] = {
+	ODP_TEST_INFO(synchronizers_test_no_barrier_functional),
+	ODP_TEST_INFO(synchronizers_test_barrier_functional),
+	ODP_TEST_INFO_NULL
 };
 
 /* Thread-unsafe tests */
@@ -958,9 +958,9 @@ void synchronizers_test_no_lock_functional(void)
 	odp_cunit_thread_exit(&arg);
 }
 
-CU_TestInfo synchronizers_suite_no_locking[] = {
-	_CU_TEST_INFO(synchronizers_test_no_lock_functional),
-	CU_TEST_INFO_NULL
+odp_testinfo_t synchronizers_suite_no_locking[] = {
+	ODP_TEST_INFO(synchronizers_test_no_lock_functional),
+	ODP_TEST_INFO_NULL
 };
 
 /* Spin lock tests */
@@ -983,10 +983,10 @@ void synchronizers_test_spinlock_functional(void)
 	odp_cunit_thread_exit(&arg);
 }
 
-CU_TestInfo synchronizers_suite_spinlock[] = {
-	_CU_TEST_INFO(synchronizers_test_spinlock_api),
-	_CU_TEST_INFO(synchronizers_test_spinlock_functional),
-	CU_TEST_INFO_NULL
+odp_testinfo_t synchronizers_suite_spinlock[] = {
+	ODP_TEST_INFO(synchronizers_test_spinlock_api),
+	ODP_TEST_INFO(synchronizers_test_spinlock_functional),
+	ODP_TEST_INFO_NULL
 };
 
 /* Ticket lock tests */
@@ -1010,10 +1010,10 @@ void synchronizers_test_ticketlock_functional(void)
 	odp_cunit_thread_exit(&arg);
 }
 
-CU_TestInfo synchronizers_suite_ticketlock[] = {
-	_CU_TEST_INFO(synchronizers_test_ticketlock_api),
-	_CU_TEST_INFO(synchronizers_test_ticketlock_functional),
-	CU_TEST_INFO_NULL
+odp_testinfo_t synchronizers_suite_ticketlock[] = {
+	ODP_TEST_INFO(synchronizers_test_ticketlock_api),
+	ODP_TEST_INFO(synchronizers_test_ticketlock_functional),
+	ODP_TEST_INFO_NULL
 };
 
 /* RW lock tests */
@@ -1036,10 +1036,10 @@ void synchronizers_test_rwlock_functional(void)
 	odp_cunit_thread_exit(&arg);
 }
 
-CU_TestInfo synchronizers_suite_rwlock[] = {
-	_CU_TEST_INFO(synchronizers_test_rwlock_api),
-	_CU_TEST_INFO(synchronizers_test_rwlock_functional),
-	CU_TEST_INFO_NULL
+odp_testinfo_t synchronizers_suite_rwlock[] = {
+	ODP_TEST_INFO(synchronizers_test_rwlock_api),
+	ODP_TEST_INFO(synchronizers_test_rwlock_functional),
+	ODP_TEST_INFO_NULL
 };
 
 int synchronizers_suite_init(void)
@@ -1188,28 +1188,28 @@ void synchronizers_test_atomic_fetch_add_sub(void)
 	test_atomic_functional(test_atomic_fetch_add_sub_thread);
 }
 
-CU_TestInfo synchronizers_suite_atomic[] = {
-	_CU_TEST_INFO(synchronizers_test_atomic_inc_dec),
-	_CU_TEST_INFO(synchronizers_test_atomic_add_sub),
-	_CU_TEST_INFO(synchronizers_test_atomic_fetch_inc_dec),
-	_CU_TEST_INFO(synchronizers_test_atomic_fetch_add_sub),
-	CU_TEST_INFO_NULL,
+odp_testinfo_t synchronizers_suite_atomic[] = {
+	ODP_TEST_INFO(synchronizers_test_atomic_inc_dec),
+	ODP_TEST_INFO(synchronizers_test_atomic_add_sub),
+	ODP_TEST_INFO(synchronizers_test_atomic_fetch_inc_dec),
+	ODP_TEST_INFO(synchronizers_test_atomic_fetch_add_sub),
+	ODP_TEST_INFO_NULL,
 };
 
-CU_SuiteInfo synchronizers_suites[] = {
-	{"barrier", NULL,
-	 NULL, NULL, NULL, synchronizers_suite_barrier},
-	{"nolocking", synchronizers_suite_init,
-	 NULL, NULL, NULL, synchronizers_suite_no_locking},
-	{"spinlock", synchronizers_suite_init,
-	 NULL, NULL, NULL, synchronizers_suite_spinlock},
-	{"ticketlock", synchronizers_suite_init,
-	 NULL, NULL, NULL, synchronizers_suite_ticketlock},
-	{"rwlock", synchronizers_suite_init,
-	 NULL, NULL, NULL, synchronizers_suite_rwlock},
-	{"atomic", NULL, NULL, NULL, NULL,
-	 synchronizers_suite_atomic},
-	CU_SUITE_INFO_NULL
+odp_suiteinfo_t synchronizers_suites[] = {
+	{"barrier", NULL, NULL,
+		synchronizers_suite_barrier},
+	{"nolocking", synchronizers_suite_init, NULL,
+		synchronizers_suite_no_locking},
+	{"spinlock", synchronizers_suite_init, NULL,
+		synchronizers_suite_spinlock},
+	{"ticketlock", synchronizers_suite_init, NULL,
+		synchronizers_suite_ticketlock},
+	{"rwlock", synchronizers_suite_init, NULL,
+		synchronizers_suite_rwlock},
+	{"atomic", NULL, NULL,
+		synchronizers_suite_atomic},
+	ODP_SUITE_INFO_NULL
 };
 
 int synchronizers_main(void)
diff --git a/test/validation/synchronizers/synchronizers.h b/test/validation/synchronizers/synchronizers.h
index 45b90e9..f16477c 100644
--- a/test/validation/synchronizers/synchronizers.h
+++ b/test/validation/synchronizers/synchronizers.h
@@ -7,7 +7,7 @@
 #ifndef _ODP_TEST_SYNCHRONIZERS_H_
 #define _ODP_TEST_SYNCHRONIZERS_H_
 
-#include <CUnit/Basic.h>
+#include <odp_cunit_common.h>
 
 /* test functions: */
 void synchronizers_test_no_barrier_functional(void);
@@ -25,18 +25,18 @@ void synchronizers_test_atomic_fetch_inc_dec(void);
 void synchronizers_test_atomic_fetch_add_sub(void);
 
 /* test arrays: */
-extern CU_TestInfo synchronizers_suite_barrier[];
-extern CU_TestInfo synchronizers_suite_no_locking[];
-extern CU_TestInfo synchronizers_suite_spinlock[];
-extern CU_TestInfo synchronizers_suite_ticketlock[];
-extern CU_TestInfo synchronizers_suite_rwlock[];
-extern CU_TestInfo synchronizers_suite_atomic[];
+extern odp_testinfo_t synchronizers_suite_barrier[];
+extern odp_testinfo_t synchronizers_suite_no_locking[];
+extern odp_testinfo_t synchronizers_suite_spinlock[];
+extern odp_testinfo_t synchronizers_suite_ticketlock[];
+extern odp_testinfo_t synchronizers_suite_rwlock[];
+extern odp_testinfo_t synchronizers_suite_atomic[];
 
 /* test array init/term functions: */
 int synchronizers_suite_init(void);
 
 /* test registry: */
-extern CU_SuiteInfo synchronizers_suites[];
+extern odp_suiteinfo_t synchronizers_suites[];
 
 /* executable init/term functions: */
 int synchronizers_init(void);