validation: init: adding command line argument parsing

As the tests themselves do not have specific args, they just call
the cunit_common parsing function to pick up cunit_common and helpers
arguments.

Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Reviewed-by: Brian Brooks <brian.brooks@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

5 files changed, 24 insertions, 12 deletions

diff --git a/test/validation/init/init.c b/test/validation/init/init.c
index a802d4187..61055fad5 100644
--- a/test/validation/init/init.c
+++ b/test/validation/init/init.c
@@ -52,10 +52,14 @@ static void odp_init_abort(void)
 	abort();
 }
 
-int init_main_abort(void)
+int init_main_abort(int argc, char *argv[])
 {
 	int ret;
 
+	/* parse common options: */
+	if (odp_cunit_parse_options(argc, argv))
+		return -1;
+
 	/* prevent default ODP init: */
 	odp_cunit_register_global_init(NULL);
 	odp_cunit_register_global_term(NULL);
@@ -116,10 +120,14 @@ static int odp_init_log(odp_log_level_t level __attribute__((unused)),
 	return r;
 }
 
-int init_main_log(void)
+int init_main_log(int argc, char *argv[])
 {
 	int ret;
 
+	/* parse common options: */
+	if (odp_cunit_parse_options(argc, argv))
+		return -1;
+
 	/* prevent default ODP init: */
 	odp_cunit_register_global_init(NULL);
 	odp_cunit_register_global_term(NULL);
@@ -157,10 +165,14 @@ odp_suiteinfo_t init_suites_ok[] = {
 	ODP_SUITE_INFO_NULL,
 };
 
-int init_main_ok(void)
+int init_main_ok(int argc, char *argv[])
 {
 	int ret;
 
+	/* parse common options: */
+	if (odp_cunit_parse_options(argc, argv))
+		return -1;
+
 	/* prevent default ODP init: */
 	odp_cunit_register_global_init(NULL);
 	odp_cunit_register_global_term(NULL);
diff --git a/test/validation/init/init.h b/test/validation/init/init.h
index 272d42652..cad9cf988 100644
--- a/test/validation/init/init.h
+++ b/test/validation/init/init.h
@@ -25,8 +25,8 @@ extern odp_suiteinfo_t init_suites_log[];
 extern odp_suiteinfo_t init_suites_ok[];
 
 /* main test program: */
-int init_main_abort(void);
-int init_main_log(void);
-int init_main_ok(void);
+int init_main_abort(int argc, char *argv[]);
+int init_main_log(int argc, char *argv[]);
+int init_main_ok(int argc, char *argv[]);
 
 #endif
diff --git a/test/validation/init/init_main_abort.c b/test/validation/init/init_main_abort.c
index c7bdd9deb..2e0faafb8 100644
--- a/test/validation/init/init_main_abort.c
+++ b/test/validation/init/init_main_abort.c
@@ -5,7 +5,7 @@
  */
 #include "init.h"
 
-int main(void)
+int main(int argc, char *argv[])
 {
-	return init_main_abort();
+	return init_main_abort(argc, argv);
 }
diff --git a/test/validation/init/init_main_log.c b/test/validation/init/init_main_log.c
index f35ac38e5..41dd00d72 100644
--- a/test/validation/init/init_main_log.c
+++ b/test/validation/init/init_main_log.c
@@ -5,7 +5,7 @@
  */
 #include "init.h"
 
-int main(void)
+int main(int argc, char *argv[])
 {
-	return init_main_log();
+	return init_main_log(argc, argv);
 }
diff --git a/test/validation/init/init_main_ok.c b/test/validation/init/init_main_ok.c
index 285c7472f..6053ec188 100644
--- a/test/validation/init/init_main_ok.c
+++ b/test/validation/init/init_main_ok.c
@@ -5,7 +5,7 @@
  */
 #include "init.h"
 
-int main(void)
+int main(int argc, char *argv[])
 {
-	return init_main_ok();
+	return init_main_ok(argc, argv);
 }