X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Frotation.c;h=55ee2e69e79b15c37d7464150b94b6ae87e2397d;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=b8089d5c96b9f0492895b1fc776a9faa6d952cbc;hpb=674c3e2c8477aafe7b2145861ad83dd041d59018;p=lttng-tools.git diff --git a/tests/regression/tools/notification/rotation.c b/tests/regression/tools/notification/rotation.c index b8089d5c9..55ee2e69e 100644 --- a/tests/regression/tools/notification/rotation.c +++ b/tests/regression/tools/notification/rotation.c @@ -11,20 +11,10 @@ #include #include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include #define TEST_COUNT 36 @@ -79,6 +69,7 @@ int setup_rotation_trigger(const struct session *session, struct lttng_trigger *rotation_completed_trigger = NULL; enum lttng_condition_status condition_status; enum lttng_notification_channel_status notification_channel_status; + enum lttng_error_code ret_code; notify = lttng_action_notify_create(); if (!notify) { @@ -162,17 +153,23 @@ int setup_rotation_trigger(const struct session *session, } /* Register rotation ongoing and completed triggers. */ - ret = lttng_register_trigger(rotation_ongoing_trigger); - ok(ret == 0, "Registered session rotation ongoing trigger"); - if (ret) { + ret_code = lttng_register_trigger_with_automatic_name( + rotation_ongoing_trigger); + ok(ret_code == LTTNG_OK, "Registered session rotation ongoing trigger"); + if (ret_code != LTTNG_OK) { + ret = -ret_code; goto end; } - ret = lttng_register_trigger(rotation_completed_trigger); - ok(ret == 0, "Registered session rotation completed trigger"); - if (ret) { + ret_code = lttng_register_trigger_with_automatic_name( + rotation_completed_trigger); + ok(ret_code == LTTNG_OK, + "Registered session rotation completed trigger"); + if (ret_code != LTTNG_OK) { + ret = -ret_code; goto end; } + end: lttng_trigger_destroy(rotation_ongoing_trigger); lttng_trigger_destroy(rotation_completed_trigger);