validation: std_clib: 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, 2 insertions, 38 deletions

diff --git a/test/validation/api/std_clib/Makefile.am b/test/validation/api/std_clib/Makefile.am
index 34b888bbb..9d3b32d3f 100644
--- a/test/validation/api/std_clib/Makefile.am
+++ b/test/validation/api/std_clib/Makefile.am
@@ -1,4 +1,4 @@
 include ../Makefile.inc
 
 test_PROGRAMS = std_clib_main
-std_clib_main_SOURCES = std_clib_main.c std_clib.c std_clib.h
+std_clib_main_SOURCES = std_clib.c
diff --git a/test/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib/std_clib.c
index 33128eef6..3ef5aab71 100644
--- a/test/validation/api/std_clib/std_clib.c
+++ b/test/validation/api/std_clib/std_clib.c
@@ -8,7 +8,6 @@
 
 #include <odp_api.h>
 #include <odp_cunit_common.h>
-#include "std_clib.h"
 
 #include <string.h>
 
@@ -95,7 +94,7 @@ odp_suiteinfo_t std_clib_suites[] = {
 	ODP_SUITE_INFO_NULL
 };
 
-int std_clib_main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	int ret;
 
diff --git a/test/validation/api/std_clib/std_clib.h b/test/validation/api/std_clib/std_clib.h
deleted file mode 100644
index 2804f27e2..000000000
--- a/test/validation/api/std_clib/std_clib.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright (c) 2015, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-
-#ifndef _ODP_TEST_STD_CLIB_H_
-#define _ODP_TEST_STD_CLIB_H_
-
-#include <odp_cunit_common.h>
-
-/* test arrays: */
-extern odp_testinfo_t std_clib_suite[];
-
-/* test registry: */
-extern odp_suiteinfo_t std_clib_suites[];
-
-/* main test program: */
-int std_clib_main(int argc, char *argv[]);
-
-#endif
diff --git a/test/validation/api/std_clib/std_clib_main.c b/test/validation/api/std_clib/std_clib_main.c
deleted file mode 100644
index dc63bb5b3..000000000
--- a/test/validation/api/std_clib/std_clib_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 "std_clib.h"
-
-int main(int argc, char *argv[])
-{
-	return std_clib_main(argc, argv);
-}