X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Futils%2Fregister-some-triggers.c;h=54eb78303348cbe3b8675a3a45193904e2e8b376;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=c92ee0f5a5b567853facc6c58cafe60d44259184;hpb=702f26c8641ee4554c629d13b9367b1e93f96e31;p=lttng-tools.git

diff --git a/tests/regression/tools/trigger/utils/register-some-triggers.c b/tests/regression/tools/trigger/utils/register-some-triggers.c
index c92ee0f5a..54eb78303 100644
--- a/tests/regression/tools/trigger/utils/register-some-triggers.c
+++ b/tests/regression/tools/trigger/utils/register-some-triggers.c
@@ -11,7 +11,6 @@
 #include <common/macros.h>
 #include <lttng/lttng.h>
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -20,14 +19,11 @@ static void register_trigger(const char *trigger_name,
 		struct lttng_action *action)
 {
 	struct lttng_trigger *trigger;
-	enum lttng_trigger_status trigger_status;
-	int ret;
+	enum lttng_error_code ret;
 
 	trigger = lttng_trigger_create(condition, action);
-	trigger_status = lttng_trigger_set_name(trigger, trigger_name);
-	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
-	ret = lttng_register_trigger(trigger);
-	assert(ret == 0);
+	ret = lttng_register_trigger_with_name(trigger, trigger_name);
+	LTTNG_ASSERT(ret == LTTNG_OK);
 }
 
 /*
@@ -45,7 +41,7 @@ static void register_trigger_action_list_notify(
 	action_notify = lttng_action_notify_create();
 	action_status = lttng_action_list_add_action(
 			action_list, action_notify);
-	assert(action_status == LTTNG_ACTION_STATUS_OK);
+	LTTNG_ASSERT(action_status == LTTNG_ACTION_STATUS_OK);
 
 	register_trigger(trigger_name, condition, action_list);
 }
@@ -60,10 +56,10 @@ static struct lttng_condition *create_session_consumed_size_condition(
 	condition_status =
 			lttng_condition_session_consumed_size_set_session_name(
 					condition, session_name);
-	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 	condition_status = lttng_condition_session_consumed_size_set_threshold(
 			condition, threshold);
-	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 
 	return condition;
 }
@@ -85,13 +81,13 @@ static void fill_buffer_usage_condition(struct lttng_condition *condition,
 
 	condition_status = lttng_condition_buffer_usage_set_session_name(
 			condition, session_name);
-	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 	condition_status = lttng_condition_buffer_usage_set_channel_name(
 			condition, channel_name);
-	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 	condition_status = lttng_condition_buffer_usage_set_domain_type(
 			condition, domain_type);
-	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 }
 
 static void fill_buffer_usage_bytes_condition(struct lttng_condition *condition,
@@ -106,7 +102,7 @@ static void fill_buffer_usage_bytes_condition(struct lttng_condition *condition,
 			condition, session_name, channel_name, domain_type);
 	condition_status = lttng_condition_buffer_usage_set_threshold(
 			condition, threshold);
-	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 }
 
 static void fill_buffer_usage_ratio_condition(struct lttng_condition *condition,
@@ -121,7 +117,7 @@ static void fill_buffer_usage_ratio_condition(struct lttng_condition *condition,
 			condition, session_name, channel_name, domain_type);
 	condition_status = lttng_condition_buffer_usage_set_threshold_ratio(
 			condition, ratio);
-	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 }
 
 static struct lttng_condition *create_buffer_usage_high_bytes_condition(
@@ -218,7 +214,7 @@ static void fill_session_rotation_condition(
 
 	condition_status = lttng_condition_session_rotation_set_session_name(
 			condition, session_name);
-	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	LTTNG_ASSERT(condition_status == LTTNG_CONDITION_STATUS_OK);
 }
 
 static struct lttng_condition *create_session_rotation_ongoing_condition(