X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=2fece6bbde05c17ee36431266dab5a19af4d5b95;hb=069fc1c5abf8a9ce01feab82906faf6d02b95c97;hp=631948cda93d4a440875a8146fb306d4147edf5a;hpb=7344b6a307b62685272f8f5dacc42d4e06e5732f;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 631948cda..2fece6bbd 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -854,28 +854,19 @@ end:
 
 int main(int argc, const char *argv[])
 {
+	int test_scenario;
 	const char *session_name = NULL;
 	const char *channel_name = NULL;
 	const char *domain_type_string = NULL;
 	enum lttng_domain_type domain_type = LTTNG_DOMAIN_NONE;
 
-	plan_tests(NUM_TESTS);
-
-	/* Argument 6 and upward are named pipe location for consumerd control */
-	named_pipe_args_start = 6;
-
-	if (argc < 7) {
-		fail("Missing parameter for tests to run %d", argc);
+	if (argc < 3) {
+		fail("Missing test scenario and/or domain type argument(s)");
 		goto error;
 	}
 
-	nb_args = argc;
-
-	domain_type_string = argv[1];
-	session_name = argv[2];
-	channel_name = argv[3];
-	app_pid = (pid_t) atoi(argv[4]);
-	app_state_file = argv[5];
+	test_scenario = atoi(argv[1]);
+	domain_type_string = argv[2];
 
 	if (!strcmp("LTTNG_DOMAIN_UST", domain_type_string)) {
 		domain_type = LTTNG_DOMAIN_UST;
@@ -888,23 +879,70 @@ int main(int argc, const char *argv[])
 		goto error;
 	}
 
-	/*
-	 * Test cases are responsible for resuming the app when needed and
-	 * making sure it's suspended when returning.
-	 */
-	suspend_application();
+	switch (test_scenario) {
+	case 1:
+	{
+		plan_tests(7);
+		/* Test cases that need gen-ust-event testapp. */
+		diag("Test basic notification error paths for domain %s",
+				domain_type_string);
+		test_invalid_channel_subscription(domain_type);
+		break;
+	}
+	case 2:
+	{
+		/* Test cases that need a tracing session enabled. */
+		plan_tests(99);
 
-	diag("Test trigger for domain %s with buffer_usage_low condition", domain_type_string);
-	test_triggers_buffer_usage_condition(session_name, channel_name, domain_type, LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW);
-	diag("Test trigger for domain %s with buffer_usage_high condition", domain_type_string);
-	test_triggers_buffer_usage_condition(session_name, channel_name, domain_type, LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH);
+		/*
+		 * Argument 7 and upward are named pipe location for consumerd
+		 * control.
+		 */
+		named_pipe_args_start = 7;
+
+		if (argc < 8) {
+			fail("Missing parameter for tests to run %d", argc);
+			goto error;
+		}
 
-	/* Basic error path check. */
-	test_invalid_channel_subscription(domain_type);
-	test_subscription_twice(session_name, channel_name, domain_type);
+		nb_args = argc;
+
+		session_name = argv[3];
+		channel_name = argv[4];
+		app_pid = (pid_t) atoi(argv[5]);
+		app_state_file = argv[6];
+
+		/*
+		 * Test cases are responsible for resuming the app when needed
+		 * and making sure it's suspended when returning.
+		 */
+		suspend_application();
+
+		test_subscription_twice(session_name, channel_name,
+				domain_type);
+
+		diag("Test trigger for domain %s with buffer_usage_low condition",
+				domain_type_string);
+		test_triggers_buffer_usage_condition(session_name, channel_name,
+				domain_type,
+				LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW);
+
+		diag("Test trigger for domain %s with buffer_usage_high condition",
+				domain_type_string);
+		test_triggers_buffer_usage_condition(session_name, channel_name,
+				domain_type,
+				LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH);
+
+		diag("Test buffer usage notification channel api for domain %s",
+				domain_type_string);
+		test_buffer_usage_notification_channel(session_name, channel_name,
+				domain_type, argv);
+		break;
+	}
+	default:
+		abort();
+	}
 
-	diag("Test buffer usage notification channel api for domain %s", domain_type_string);
-	test_buffer_usage_notification_channel(session_name, channel_name, domain_type, argv);
 error:
 	return exit_status();
 }