From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Thu, 6 Feb 2020 17:24:08 +0000 (-0500)
Subject: Tests: Cleanup: extract duplicated code to `setup_buffer_usage_condition()`
X-Git-Tag: v2.13.0-rc1~302
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=174233023786f6039b37088d7b4a46f2b4ce5532

Tests: Cleanup: extract duplicated code to `setup_buffer_usage_condition()`

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I401751d6ae92fb96b532972257a9a8127919778d
Depends-on: lttng-ust: I5a800fc92e588c2a6a0e26282b0ad5f31c044479
---

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index cc42e6153..4264539fe 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -396,7 +396,51 @@ void wait_data_pending(const char *session_name)
 }
 
 static
-void test_notification_channel(const char *session_name, const char *channel_name, const enum lttng_domain_type domain_type, const char **argv)
+int setup_buffer_usage_condition(struct lttng_condition *condition,
+		const char *condition_name,
+		const char *session_name,
+		const char *channel_name,
+		const enum lttng_domain_type domain_type)
+{
+	enum lttng_condition_status condition_status;
+	int ret = 0;
+
+	condition_status = lttng_condition_buffer_usage_set_session_name(
+			condition, session_name);
+	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
+		fail("Failed to set session name on creation of condition `%s`",
+				condition_name);
+		ret = -1;
+		goto end;
+	}
+
+	condition_status = lttng_condition_buffer_usage_set_channel_name(
+			condition, channel_name);
+	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
+		fail("Failed to set channel name on creation of condition `%s`",
+				condition_name);
+		ret = -1;
+		goto end;
+	}
+
+	condition_status = lttng_condition_buffer_usage_set_domain_type(
+			condition, domain_type);
+	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
+		fail("Failed to set domain type on creation of condition `%s`",
+				condition_name);
+		ret = -1;
+		goto end;
+	}
+
+end:
+	return ret;
+}
+
+static
+void test_notification_channel(const char *session_name,
+		const char *channel_name,
+		const enum lttng_domain_type domain_type,
+		const char **argv)
 {
 	int ret = 0;
 	enum lttng_condition_status condition_status;
@@ -443,22 +487,10 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 		goto end;
 	}
 
-	condition_status = lttng_condition_buffer_usage_set_session_name(
-			dummy_condition, session_name);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on dummy_condition creation");
-		goto end;
-	}
-	condition_status = lttng_condition_buffer_usage_set_channel_name(
-			dummy_condition, channel_name);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on dummy_condition creation");
-		goto end;
-	}
-	condition_status = lttng_condition_buffer_usage_set_domain_type(
-			dummy_condition, domain_type);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on dummy_condition creation");
+	ret = setup_buffer_usage_condition(dummy_condition, "dummy_condition",
+			session_name, channel_name, domain_type);
+	if (ret) {
+		fail("Setup error on dummy condition creation");
 		goto end;
 	}
 
@@ -475,24 +507,11 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 		goto end;
 	}
 
-	condition_status = lttng_condition_buffer_usage_set_session_name(
-			low_condition, session_name);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on low_condition creation");
-		goto end;
-	}
-	condition_status = lttng_condition_buffer_usage_set_channel_name(
-			low_condition, channel_name);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on low_condition creation");
-		goto end;
-	}
-	condition_status = lttng_condition_buffer_usage_set_domain_type(
-			low_condition, domain_type);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on low_condition creation");
+	ret = setup_buffer_usage_condition(low_condition, "low_condition",
+			session_name, channel_name, domain_type);
+	if (ret) {
+		fail("Setup error on low condition creation");
 		goto end;
-
 	}
 
 	/* Register a high condition with a ratio */
@@ -509,22 +528,10 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 		goto end;
 	}
 
-	condition_status = lttng_condition_buffer_usage_set_session_name(
-			high_condition, session_name);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on high_condition creation");
-		goto end;
-	}
-	condition_status = lttng_condition_buffer_usage_set_channel_name(
-			high_condition, channel_name);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on high_condition creation");
-		goto end;
-	}
-	condition_status = lttng_condition_buffer_usage_set_domain_type(
-			high_condition, domain_type);
-	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		fail("Setup error on high_condition creation");
+	ret = setup_buffer_usage_condition(high_condition, "high_condition",
+			session_name, channel_name, domain_type);
+	if (ret) {
+		fail("Setup error on high condition creation");
 		goto end;
 	}