Move on-event*.* to event-rule-matches*.*

[lttng-tools.git] / tests / regression / tools / trigger / utils / notification-client.c

diff --git a/tests/regression/tools/trigger/utils/notification-client.c b/tests/regression/tools/trigger/utils/notification-client.c
index 904d7e5650c90661bf3dfa524cb837ce266c58c2..7e92cba6156f147845a53f2fdb43839352bc7055 100644 (file)
--- a/tests/regression/tools/trigger/utils/notification-client.c
+++ b/tests/regression/tools/trigger/utils/notification-client.c
@@ -14,7 +14,7 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include <lttng/condition/on-event.h>
+#include <lttng/condition/event-rule-matches.h>
 #include <lttng/lttng.h>
 
 #include "utils.h"
@@ -98,8 +98,8 @@ int main(int argc, char **argv)
        int ret;
        int option;
        int option_index;
-       const char *expected_trigger_name = NULL;
-       const char *end_trigger_name = NULL;
+       char *expected_trigger_name = NULL;
+       char *end_trigger_name = NULL;
        struct lttng_triggers *triggers = NULL;
        unsigned int count, i, subcription_count = 0;
        enum lttng_trigger_status trigger_status;
@@ -240,7 +240,6 @@ int main(int argc, char **argv)
                        break;
                case LTTNG_NOTIFICATION_CHANNEL_STATUS_CLOSED:
                        printf("Notification channel was closed by peer.\n");
-                       ret = -1;
                        break;
                default:
                        fprintf(stderr, "A communication error occurred on the notification channel.\n");
@@ -295,5 +294,8 @@ evaluate_success:
 end:
        lttng_triggers_destroy(triggers);
        lttng_notification_channel_destroy(notification_channel);
+       free(after_notif_register_file_path);
+       free(end_trigger_name);
+       free(expected_trigger_name);
        return !!ret;
 }