From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 22 Nov 2019 20:00:38 +0000 (-0500)
Subject: tests: gen-ust-events: abort() on argument error
X-Git-Tag: v2.12.0-rc1~115
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=56d4838;p=lttng-tools.git

tests: gen-ust-events: abort() on argument error

Facilitates test transition: quickly identify tests which were not
updated.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Idec886cc565c4cb7f1de89e7f3f765c882f4b988
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/utils/testapp/gen-ust-events/gen-ust-events.c b/tests/utils/testapp/gen-ust-events/gen-ust-events.c
index 353523b7c..8f2acdbab 100644
--- a/tests/utils/testapp/gen-ust-events/gen-ust-events.c
+++ b/tests/utils/testapp/gen-ust-events/gen-ust-events.c
@@ -109,6 +109,17 @@ int main(int argc, char **argv)
 
 	if (optind != argc) {
 		fprintf(stderr, "Error: takes long options only.\n");
+
+		/*
+		 * Aborting the test program for now because callers typically don't check
+		 * the test program return value, and the transition from positional
+		 * arguments to getopt causes hangs when caller scripts are not updated.
+		 * An abort is easier to diagnose and fix. This is a temporary solution:
+		 * we should eventually ensure that all scripts test and report the test
+		 * app return values.
+		 */
+		abort();
+
 		ret = -1;
 		goto end;
 	}