X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Futils%2Fnotification-client.c;h=98c00d6f7a77303f269c00cf9bed98601021b1c6;hb=a5c2d2a71919b8d1542b62f6d32579125cc2c8f8;hp=7e92cba6156f147845a53f2fdb43839352bc7055;hpb=670a26e4165562ab2dc5a16b9941f942e4f30996;p=lttng-tools.git diff --git a/tests/regression/tools/trigger/utils/notification-client.c b/tests/regression/tools/trigger/utils/notification-client.c index 7e92cba61..98c00d6f7 100644 --- a/tests/regression/tools/trigger/utils/notification-client.c +++ b/tests/regression/tools/trigger/utils/notification-client.c @@ -36,22 +36,22 @@ static struct option long_options[] = {0, 0, 0, 0} }; -static bool action_group_contains_notify( - const struct lttng_action *action_group) +static bool action_list_contains_notify( + const struct lttng_action *action_list) { unsigned int i, count; enum lttng_action_status status = - lttng_action_group_get_count(action_group, &count); + lttng_action_list_get_count(action_list, &count); if (status != LTTNG_ACTION_STATUS_OK) { - printf("Failed to get action count from action group\n"); + printf("Failed to get action count from action list\n"); exit(1); } for (i = 0; i < count; i++) { const struct lttng_action *action = - lttng_action_group_get_at_index( - action_group, i); + lttng_action_list_get_at_index( + action_list, i); const enum lttng_action_type action_type = lttng_action_get_type(action); @@ -62,6 +62,7 @@ static bool action_group_contains_notify( return false; } +/* Only expects named triggers. */ static bool is_trigger_name(const char *expected_trigger_name, struct lttng_notification *notification) { @@ -181,7 +182,7 @@ int main(int argc, char **argv) } } if (!((action_type == LTTNG_ACTION_TYPE_GROUP && - action_group_contains_notify(action)) || + action_list_contains_notify(action)) || action_type == LTTNG_ACTION_TYPE_NOTIFY)) { /* "The action of trigger is not notify, skipping. */ continue;