From 8db430e7dcb5305c60a93ccb2fc90e8e0f006915 Mon Sep 17 00:00:00 2001
From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Tue, 11 Feb 2020 19:27:05 -0500
Subject: [PATCH] Tests: gen-ust-nevents: use options instead of arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I59c648c650304e12b30bf8a3eaedaf9727c48700
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 .../regression/tools/exclusion/test_exclusion |  2 +-
 tests/regression/tools/snapshots/ust_test     |  2 +-
 .../testapp/gen-ust-nevents/gen-ust-nevents.c | 37 ++++++++++++++-----
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/tests/regression/tools/exclusion/test_exclusion b/tests/regression/tools/exclusion/test_exclusion
index e41925fa5..ed653b72f 100755
--- a/tests/regression/tools/exclusion/test_exclusion
+++ b/tests/regression/tools/exclusion/test_exclusion
@@ -30,7 +30,7 @@ function enable_ust_lttng_all_event_exclusion()
 
 function run_apps
 {
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
+	$TESTAPP_BIN --iter $NR_ITER --wait $NR_USEC_WAIT >/dev/null 2>&1
 	ok $? "Running test application"
 }
 
diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 3f7ee2555..c2563afd8 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -358,7 +358,7 @@ function test_ust_local_snapshot_large_metadata ()
 	enable_ust_lttng_event_ok $SESSION_NAME $LM_EVENT $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
-	$LM_BIN 1 1
+	$LM_BIN --iter 1 --wait 1
 	ok $? "Start application to trace"
 	lttng_snapshot_record $SESSION_NAME
 	stop_lttng_tracing_ok $SESSION_NAME
diff --git a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
index 52e5f3cb9..329368731 100644
--- a/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
+++ b/tests/utils/testapp/gen-ust-nevents/gen-ust-nevents.c
@@ -7,6 +7,7 @@
 
 #define _LGPL_SOURCE
 #include <arpa/inet.h>
+#include <getopt.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,9 +22,17 @@
 #define TRACEPOINT_DEFINE
 #include "tp.h"
 
+static struct option long_options[] =
+{
+	/* These options set a flag. */
+	{"iter", required_argument, 0, 'i'},
+	{"wait", required_argument, 0, 'w'},
+	{0, 0, 0, 0}
+};
+
 int main(int argc, char **argv)
 {
-	int i, netint, ret = 0;
+	int i, netint, ret = 0, option_index, option;
 	long values[] = { 1, 2, 3 };
 	char text[10] = "test";
 	double dbl = 2.0;
@@ -31,19 +40,29 @@ int main(int argc, char **argv)
 	unsigned int nr_iter = 100;
 	useconds_t nr_usec = 0;
 
+	while ((option = getopt_long(argc, argv, "i:w:",
+			long_options, &option_index)) != -1) {
+		switch (option) {
+		case 'i':
+			nr_iter = atoi(optarg);
+			break;
+		case 'w':
+			nr_usec = atoi(optarg);
+			break;
+		case '?':
+			/* getopt_long already printed an error message. */
+			break;
+		default:
+			ret = -1;
+			goto end;
+		}
+	}
+
 	if (set_signal_handler()) {
 		ret = -1;
 		goto end;
 	}
 
-	if (argc >= 2) {
-		nr_iter = atoi(argv[1]);
-	}
-
-	if (argc == 3) {
-		/* By default, don't wait unless user specifies. */
-		nr_usec = atoi(argv[2]);
-	}
 
 	for (i = 0; i < nr_iter; i++) {
 		netint = htonl(i);
-- 
2.34.1