X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=e26c99d033129940128584bca9bcb7b9d18a597f;hb=65f649784e948615ec369db9eba40847a75ccaf2;hp=68a76f922a08ded50d602ca606a235300c76c9b5;hpb=10685de6af924c0ea83e451697639ed9c16586cc;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 68a76f922..e26c99d03 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -579,33 +579,24 @@ struct capture_base_field_tuple test_capture_base_fields[] = {
 static const char *get_notification_trigger_name(
 		struct lttng_notification *notification)
 {
-	const char *name = NULL;
-	enum lttng_evaluation_status status;
-	const struct lttng_evaluation *evaluation;
-	evaluation = lttng_notification_get_evaluation(notification);
-	if (evaluation == NULL) {
-		fail("lttng_notification_get_evaluation");
+	const char *trigger_name = NULL;
+	enum lttng_trigger_status trigger_status;
+	const struct lttng_trigger *trigger;
+
+	trigger = lttng_notification_get_trigger(notification);
+	if (!trigger) {
+		fail("Failed to get trigger from notification");
 		goto end;
 	}
 
-	switch (lttng_evaluation_get_type(evaluation)) {
-	case LTTNG_CONDITION_TYPE_ON_EVENT:
-	{
-		status = lttng_evaluation_on_event_get_trigger_name(
-				evaluation, &name);
-		if (status != LTTNG_EVALUATION_STATUS_OK) {
-			fail("lttng_evaluation_on_event_get_trigger_name");
-			name = NULL;
-			goto end;
-		}
-		break;
-	}
-	default:
-		fail("Wrong notification evaluation type \n");
+	trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
+	if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+		fail("Failed to get name from notification's trigger");
 		goto end;
 	}
+
 end:
-	return name;
+	return trigger_name;
 }
 
 static int validator_notification_trigger_name(
@@ -2306,7 +2297,7 @@ static int validator_notification_trigger_capture(
 {
 	int ret;
 	unsigned int capture_count, i;
-	enum lttng_evaluation_status evaluation_status;
+	enum lttng_evaluation_on_event_status on_event_evaluation_status;
 	enum lttng_event_field_value_status event_field_value_status;
 	const struct lttng_evaluation *evaluation;
 	const struct lttng_event_field_value *captured_fields;
@@ -2319,11 +2310,12 @@ static int validator_notification_trigger_capture(
 		goto end;
 	}
 
-	evaluation_status = lttng_evaluation_on_event_get_captured_values(
-			evaluation, &captured_fields);
-	if (evaluation_status != LTTNG_EVALUATION_STATUS_OK) {
+	on_event_evaluation_status =
+			lttng_evaluation_on_event_get_captured_values(
+					evaluation, &captured_fields);
+	if (on_event_evaluation_status != LTTNG_EVALUATION_ON_EVENT_STATUS_OK) {
 		diag("Failed to get event rule evaluation captured values: status = %d",
-				(int) evaluation_status);
+				(int) on_event_evaluation_status);
 		ret = 1;
 		goto end;
 	}