Save filter expression as part of agent events and save them

[lttng-tools.git] / tests / unit / test_ust_data.c

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index 52b93e9f6b87013bda56f56c34e1d7f65cfabc1c..155d83215bd1b4772b949326a5b2470d3fac7a66 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -39,15 +39,19 @@
 #define RANDOM_STRING_LEN      11
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 10
+#define NUM_TESTS 11
 
-/* For lttngerr.h */
+/* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
+int lttng_opt_mi;
 
 int ust_consumerd32_fd;
 int ust_consumerd64_fd;
 
+/* Global variable required by sessiond objects being linked-in */
+struct lttng_ht *agent_apps_ht_by_sock;
+
 static const char alphanum[] =
        "0123456789"
        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -82,7 +86,7 @@ static void test_create_one_ust_session(void)
        ok(usess != NULL, "Create UST session");
 
        ok(usess->id == 42 &&
-          usess->start_trace == 0 &&
+          usess->active == 0 &&
           usess->domain_global.channels != NULL &&
           usess->uid == 0 &&
           usess->gid == 0,
@@ -100,7 +104,7 @@ static void test_create_ust_channel(void)
 
        strncpy(attr.name, "channel0", 8);
 
-       uchan = trace_ust_create_channel(&attr);
+       uchan = trace_ust_create_channel(&attr, LTTNG_DOMAIN_UST);
        ok(uchan != NULL, "Create UST channel");
 
        ok(uchan->enabled == 0 &&
@@ -124,7 +128,7 @@ static void test_create_ust_event(void)
        ev.type = LTTNG_EVENT_TRACEPOINT;
        ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
-       event = trace_ust_create_event(&ev, NULL, NULL);
+       event = trace_ust_create_event(&ev, NULL, NULL, NULL, false);
 
        ok(event != NULL, "Create UST event");
 
@@ -156,10 +160,16 @@ static void test_create_ust_event_exclusion(void)
 
        /* set up an exclusion set */
        exclusion = zmalloc(sizeof(*exclusion) + LTTNG_SYMBOL_NAME_LEN);
+       if (!exclusion) {
+               PERROR("zmalloc");
+       }
+
+       ok(exclusion != NULL, "Create UST exclusion");
+
        exclusion->count = 1;
        strncpy((char *)(exclusion->names), get_random_string(), LTTNG_SYMBOL_NAME_LEN);
 
-       event = trace_ust_create_event(&ev, NULL, exclusion);
+       event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false);
 
        ok(event != NULL, "Create UST event with exclusion");
 
@@ -172,7 +182,6 @@ static void test_create_ust_event_exclusion(void)
           event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0',
           "Validate UST event and exclusion");
 
-       free(exclusion);
        trace_ust_destroy_event(event);
 }