2 files changed, 22 insertions, 6 deletions
diff --git a/test/validation/cpumask/cpumask.c b/test/validation/cpumask/cpumask.c
index 76b764859..029baadf6 100644
--- a/test/validation/cpumask/cpumask.c
+++ b/test/validation/cpumask/cpumask.c
@@ -10,10 +10,10 @@
 #include "cpumask.h"
 #include "mask_common.h"
 
-/* default worker paramiter to get all that may be available */
+/* default worker parameter to get all that may be available */
 #define ALL_AVAILABLE 0
 
-static void cpumask_test_odp_cpumask_def_control(void)
+void cpumask_test_odp_cpumask_def_control(void)
 {
 	unsigned num;
 	unsigned mask_count;
@@ -28,7 +28,7 @@ static void cpumask_test_odp_cpumask_def_control(void)
 	CU_ASSERT(num <= max_cpus);
 }
 
-static void cpumask_test_odp_cpumask_def_worker(void)
+void cpumask_test_odp_cpumask_def_worker(void)
 {
 	unsigned num;
 	unsigned mask_count;
@@ -43,7 +43,7 @@ static void cpumask_test_odp_cpumask_def_worker(void)
 	CU_ASSERT(num <= max_cpus);
 }
 
-static void cpumask_test_odp_cpumask_def(void)
+void cpumask_test_odp_cpumask_def(void)
 {
 	unsigned mask_count;
 	unsigned num_worker;
@@ -72,7 +72,7 @@ static void cpumask_test_odp_cpumask_def(void)
 	CU_ASSERT(num_worker > 0);
 }
 
-static CU_TestInfo cpumask_suite[] = {
+CU_TestInfo cpumask_suite[] = {
 	{"odp_cpumask_to/from_str()", cpumask_test_odp_cpumask_to_from_str},
 	{"odp_cpumask_equal()",	      cpumask_test_odp_cpumask_equal},
 	{"odp_cpumask_zero()",	      cpumask_test_odp_cpumask_zero},
@@ -94,7 +94,7 @@ static CU_TestInfo cpumask_suite[] = {
 	CU_TEST_INFO_NULL,
 };
 
-static CU_SuiteInfo cpumask_suites[] = {
+CU_SuiteInfo cpumask_suites[] = {
 	{"Cpumask", NULL, NULL, NULL, NULL, cpumask_suite},
 	CU_SUITE_INFO_NULL,
 };
diff --git a/test/validation/cpumask/cpumask.h b/test/validation/cpumask/cpumask.h
index 2c6fb4adc..7a58b5d0e 100644
--- a/test/validation/cpumask/cpumask.h
+++ b/test/validation/cpumask/cpumask.h
@@ -7,6 +7,22 @@
 #ifndef _ODP_TEST_CPUMASK_H_
 #define _ODP_TEST_CPUMASK_H_
 
+#include <odp.h>
+#include <CUnit/Basic.h>
+
+/* test functions: */
+#include "mask_common.h"
+void cpumask_test_odp_cpumask_def_control(void);
+void cpumask_test_odp_cpumask_def_worker(void);
+void cpumask_test_odp_cpumask_def(void);
+
+/* test arrays: */
+extern CU_TestInfo cpumask_suite[];
+
+/* test registry: */
+extern CU_SuiteInfo cpumask_suites[];
+
+/* main test program: */
 int cpumask_main(void);
 
 #endif