validation: queue: simplify test infrastructure

Merge separate file with just main() function into main test file.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

4 files changed, 8 insertions, 54 deletions

diff --git a/test/validation/api/queue/Makefile.am b/test/validation/api/queue/Makefile.am
index 5ed4638bc..94a6b28a9 100644
--- a/test/validation/api/queue/Makefile.am
+++ b/test/validation/api/queue/Makefile.am
@@ -1,4 +1,4 @@
 include ../Makefile.inc
 
 test_PROGRAMS = queue_main
-queue_main_SOURCES = queue_main.c queue.c queue.h
+queue_main_SOURCES = queue.c
diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index 3c6db33ab..8746f5066 100644
--- a/test/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
@@ -8,7 +8,6 @@
 
 #include <odp_api.h>
 #include <odp_cunit_common.h>
-#include "queue.h"
 
 #define MAX_BUFFER_QUEUE        (8)
 #define MSG_POOL_SIZE           (4 * 1024 * 1024)
@@ -29,7 +28,7 @@ static void generate_name(char *name, uint32_t index)
 	name[5] = 'A' + (index % 26);
 }
 
-int queue_suite_init(void)
+static int queue_suite_init(void)
 {
 	odp_pool_param_t params;
 
@@ -47,12 +46,12 @@ int queue_suite_init(void)
 	return 0;
 }
 
-int queue_suite_term(void)
+static int queue_suite_term(void)
 {
 	return odp_pool_destroy(pool);
 }
 
-void queue_test_capa(void)
+static void queue_test_capa(void)
 {
 	odp_queue_capability_t capa;
 	odp_queue_param_t qparams;
@@ -115,7 +114,7 @@ void queue_test_capa(void)
 	}
 }
 
-void queue_test_mode(void)
+static void queue_test_mode(void)
 {
 	odp_queue_param_t qparams;
 	odp_queue_t queue;
@@ -155,7 +154,7 @@ void queue_test_mode(void)
 	}
 }
 
-void queue_test_param(void)
+static void queue_test_param(void)
 {
 	odp_queue_t queue, null_queue;
 	odp_event_t enev[MAX_BUFFER_QUEUE];
@@ -260,7 +259,7 @@ void queue_test_param(void)
 	CU_ASSERT(odp_queue_destroy(queue) == 0);
 }
 
-void queue_test_info(void)
+static void queue_test_info(void)
 {
 	odp_queue_t q_plain, q_order;
 	const char *const nq_plain = "test_q_plain";
@@ -338,7 +337,7 @@ odp_suiteinfo_t queue_suites[] = {
 	ODP_SUITE_INFO_NULL,
 };
 
-int queue_main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	int ret;
 
diff --git a/test/validation/api/queue/queue.h b/test/validation/api/queue/queue.h
deleted file mode 100644
index 6b787b1d6..000000000
--- a/test/validation/api/queue/queue.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (c) 2015, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-
-#ifndef _ODP_TEST_QUEUE_H_
-#define _ODP_TEST_QUEUE_H_
-
-#include <odp_cunit_common.h>
-
-/* test functions: */
-void queue_test_capa(void);
-void queue_test_mode(void);
-void queue_test_param(void);
-void queue_test_info(void);
-
-/* test arrays: */
-extern odp_testinfo_t queue_suite[];
-
-/* test array init/term functions: */
-int queue_suite_init(void);
-int queue_suite_term(void);
-
-/* test registry: */
-extern odp_suiteinfo_t queue_suites[];
-
-/* main test program: */
-int queue_main(int argc, char *argv[]);
-
-#endif
diff --git a/test/validation/api/queue/queue_main.c b/test/validation/api/queue/queue_main.c
deleted file mode 100644
index 7ed054119..000000000
--- a/test/validation/api/queue/queue_main.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Copyright (c) 2015, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-
-#include "config.h"
-
-#include "queue.h"
-
-int main(int argc, char *argv[])
-{
-	return queue_main(argc, argv);
-}