test: cunit: make odp_cunit_parse_options() update argc

Have odp_cunit_parse_options() update the option count after it has
removed the options it handled. This enables the callers to have their
own command line option processing after odp_cunit_parse_options() as
probably originally intended.

Signed-off-by: Janne Peltonen <janne.peltonen@nokia.com>
Reviewed-by: Matias Elo <matias.elo@nokia.com>

36 files changed, 37 insertions, 37 deletions

diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
index 3b4ba819c..98148d6c7 100644
--- a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(shmem_suites);
diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c
index a5b9ff1ea..651ae791e 100644
--- a/test/common/odp_cunit_common.c
+++ b/test/common/odp_cunit_common.c
@@ -708,13 +708,13 @@ int odp_cunit_register(odp_suiteinfo_t testsuites[])
  * (hence also helpers options as cunit_common uses the helpers)
  * Options private to the test calling cunit_common are not parsed here.
  */
-int odp_cunit_parse_options(int argc, char *argv[])
+int odp_cunit_parse_options(int *argc, char *argv[])
 {
 	const char *ctrl_thread_env = getenv("CI_THREAD_TYPE_CONTROL");
 	const char *env = getenv("CI");
 
 	progname = argv[0];
-	odph_parse_options(argc, argv);
+	*argc = odph_parse_options(*argc, argv);
 	/* Check if we need to use control thread */
 	if (ctrl_thread_env && !strcmp(ctrl_thread_env, "true"))
 		control_thread = true;
diff --git a/test/common/odp_cunit_common.h b/test/common/odp_cunit_common.h
index 77822ee60..63e95d5fb 100644
--- a/test/common/odp_cunit_common.h
+++ b/test/common/odp_cunit_common.h
@@ -66,7 +66,7 @@ typedef struct {
 } test_shared_data_t;
 
 /* parse parameters that affect the behaviour of odp_cunit_common */
-int odp_cunit_parse_options(int argc, char *argv[]);
+int odp_cunit_parse_options(int *argc, char *argv[]);
 /* register suites to be run via odp_cunit_run() */
 int odp_cunit_register(odp_suiteinfo_t testsuites[]);
 /* update tests previously registered via odp_cunit_register() */
diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c
index 76e3c0d49..fab982462 100644
--- a/test/validation/api/atomic/atomic.c
+++ b/test/validation/api/atomic/atomic.c
@@ -1702,7 +1702,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(atomic_init);
diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c
index e4fba770f..7dc9a44c6 100644
--- a/test/validation/api/barrier/barrier.c
+++ b/test/validation/api/barrier/barrier.c
@@ -444,7 +444,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(barrier_init);
diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c
index 91cfbfb5f..2a79ed27e 100644
--- a/test/validation/api/buffer/buffer.c
+++ b/test/validation/api/buffer/buffer.c
@@ -598,7 +598,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(buffer_suites);
diff --git a/test/validation/api/chksum/chksum.c b/test/validation/api/chksum/chksum.c
index 86306ab0b..0be418f3a 100644
--- a/test/validation/api/chksum/chksum.c
+++ b/test/validation/api/chksum/chksum.c
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(chksum_suites);
diff --git a/test/validation/api/classification/classification.c b/test/validation/api/classification/classification.c
index ef35377dc..ef9a647cb 100644
--- a/test/validation/api/classification/classification.c
+++ b/test/validation/api/classification/classification.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(classification_suites);
diff --git a/test/validation/api/comp/comp.c b/test/validation/api/comp/comp.c
index cb771c989..b7dfcd359 100644
--- a/test/validation/api/comp/comp.c
+++ b/test/validation/api/comp/comp.c
@@ -558,7 +558,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(comp_init);
diff --git a/test/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c
index b358a5be6..db500df3a 100644
--- a/test/validation/api/cpumask/cpumask.c
+++ b/test/validation/api/cpumask/cpumask.c
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(cpumask_suites);
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index d5f2e3e7a..532aaf525 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -2399,7 +2399,7 @@ int main(int argc, char *argv[])
 	printf("Test mode: %s\n", full_test ? "full" : "partial");
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(crypto_init);
diff --git a/test/validation/api/dma/dma.c b/test/validation/api/dma/dma.c
index 4f454168d..efc7fa039 100644
--- a/test/validation/api/dma/dma.c
+++ b/test/validation/api/dma/dma.c
@@ -1693,7 +1693,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(dma_suites);
diff --git a/test/validation/api/errno/errno.c b/test/validation/api/errno/errno.c
index ed2ab391d..70708ce01 100644
--- a/test/validation/api/errno/errno.c
+++ b/test/validation/api/errno/errno.c
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(errno_suites);
diff --git a/test/validation/api/event/event.c b/test/validation/api/event/event.c
index f6ad86365..fbcc08d6f 100644
--- a/test/validation/api/event/event.c
+++ b/test/validation/api/event/event.c
@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(event_suites);
diff --git a/test/validation/api/hash/hash.c b/test/validation/api/hash/hash.c
index 5e4209800..a935ef7ac 100644
--- a/test/validation/api/hash/hash.c
+++ b/test/validation/api/hash/hash.c
@@ -753,7 +753,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(hash_suites);
diff --git a/test/validation/api/init/init_main.c b/test/validation/api/init/init_main.c
index 64cefa30b..f2a141b5d 100644
--- a/test/validation/api/init/init_main.c
+++ b/test/validation/api/init/init_main.c
@@ -302,7 +302,7 @@ int main(int argc, char *argv[])
 		return -1;
 
 	/* Parse common options */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	/* Prevent default ODP init */
diff --git a/test/validation/api/ipsec/ipsec_async.c b/test/validation/api/ipsec/ipsec_async.c
index 44c968a4d..053de32ec 100644
--- a/test/validation/api/ipsec/ipsec_async.c
+++ b/test/validation/api/ipsec/ipsec_async.c
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(ipsec_async_init);
diff --git a/test/validation/api/ipsec/ipsec_inline_in.c b/test/validation/api/ipsec/ipsec_inline_in.c
index cbb3a178a..8deb3c8df 100644
--- a/test/validation/api/ipsec/ipsec_inline_in.c
+++ b/test/validation/api/ipsec/ipsec_inline_in.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(ipsec_sync_init);
diff --git a/test/validation/api/ipsec/ipsec_inline_out.c b/test/validation/api/ipsec/ipsec_inline_out.c
index 3da19892b..89035f37b 100644
--- a/test/validation/api/ipsec/ipsec_inline_out.c
+++ b/test/validation/api/ipsec/ipsec_inline_out.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(ipsec_sync_init);
diff --git a/test/validation/api/ipsec/ipsec_sync.c b/test/validation/api/ipsec/ipsec_sync.c
index 74ae1fe19..68aa76e4c 100644
--- a/test/validation/api/ipsec/ipsec_sync.c
+++ b/test/validation/api/ipsec/ipsec_sync.c
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(ipsec_sync_init);
diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock/lock.c
index 78c6ee79b..a4e6932c4 100644
--- a/test/validation/api/lock/lock.c
+++ b/test/validation/api/lock/lock.c
@@ -1246,7 +1246,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(lock_init);
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index 79b8fbe50..6ae558d09 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -4591,7 +4591,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(packet_suites);
diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index 9b9150ae8..c9f8f98c3 100644
--- a/test/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
@@ -5492,7 +5492,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(pktio_suites);
diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c
index ee8aa4b67..c78931d5c 100644
--- a/test/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
@@ -2373,7 +2373,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(pool_suites);
diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index cb2b147ac..4b5ccde65 100644
--- a/test/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
@@ -1164,7 +1164,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(queue_suites);
diff --git a/test/validation/api/random/random.c b/test/validation/api/random/random.c
index 97e367678..e8b4d962a 100644
--- a/test/validation/api/random/random.c
+++ b/test/validation/api/random/random.c
@@ -527,7 +527,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(random_suites);
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index 5741a782f..dac4becbd 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -3795,7 +3795,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(global_init);
diff --git a/test/validation/api/scheduler/scheduler_no_predef_groups.c b/test/validation/api/scheduler/scheduler_no_predef_groups.c
index 1b941ac61..ad6f6d3a2 100644
--- a/test/validation/api/scheduler/scheduler_no_predef_groups.c
+++ b/test/validation/api/scheduler/scheduler_no_predef_groups.c
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(global_init);
diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c
index 257e0214e..9e91dab35 100644
--- a/test/validation/api/shmem/shmem.c
+++ b/test/validation/api/shmem/shmem.c
@@ -1163,7 +1163,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(shmem_suites);
diff --git a/test/validation/api/stash/stash.c b/test/validation/api/stash/stash.c
index 67c336a2f..162697ba9 100644
--- a/test/validation/api/stash/stash.c
+++ b/test/validation/api/stash/stash.c
@@ -1385,7 +1385,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(stash_suites);
diff --git a/test/validation/api/std/std.c b/test/validation/api/std/std.c
index 56d05a4b4..161ee87cf 100644
--- a/test/validation/api/std/std.c
+++ b/test/validation/api/std/std.c
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(std_suites);
diff --git a/test/validation/api/system/system.c b/test/validation/api/system/system.c
index 0ff103091..3f7e0497d 100644
--- a/test/validation/api/system/system.c
+++ b/test/validation/api/system/system.c
@@ -687,7 +687,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	ret = odp_cunit_register(system_suites);
diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread/thread.c
index 840256fcf..ad9ffa745 100644
--- a/test/validation/api/thread/thread.c
+++ b/test/validation/api/thread/thread.c
@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(thread_global_init);
diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c
index 8d3481e26..ef406a025 100644
--- a/test/validation/api/time/time.c
+++ b/test/validation/api/time/time.c
@@ -1007,7 +1007,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	odp_cunit_register_global_init(time_global_init);
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index 28b1399a2..281a8d763 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -3262,7 +3262,7 @@ int main(int argc, char *argv[])
 	int ret = 0;
 
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	if (global_init())
diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c
index ed07db751..b7f546dcd 100644
--- a/test/validation/api/traffic_mngr/traffic_mngr.c
+++ b/test/validation/api/traffic_mngr/traffic_mngr.c
@@ -5025,7 +5025,7 @@ odp_suiteinfo_t traffic_mngr_suites[] = {
 int main(int argc, char *argv[])
 {
 	/* parse common options: */
-	if (odp_cunit_parse_options(argc, argv))
+	if (odp_cunit_parse_options(&argc, argv))
 		return -1;
 
 	int ret = odp_cunit_register(traffic_mngr_suites);