Fix: split UST per UID/PID default values

[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 0f1c99b95d90a650c826a8d7aec527644baa336a..c79dbf6f4001a0a20a0a3ba0c3b479d7b9053e96 100644 (file)
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -29,6 +29,7 @@
 #include <bin/lttng-sessiond/lttng-ust-abi.h>
 #include <common/defaults.h>
 #include <bin/lttng-sessiond/trace-ust.h>
+#include <bin/lttng-sessiond/ust-app.h>
 
 #include <tap/tap.h>
 
@@ -46,6 +47,9 @@
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 
+int ust_consumerd32_fd;
+int ust_consumerd64_fd;
+
 static const char alphanum[] =
        "0123456789"
        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -76,14 +80,12 @@ static void test_create_one_ust_session(void)
 {
        dom.type = LTTNG_DOMAIN_UST;
 
-       usess = trace_ust_create_session(PATH1, 42);
+       usess = trace_ust_create_session(42);
        ok(usess != NULL, "Create UST session");
 
        ok(usess->id == 42 &&
           usess->start_trace == 0 &&
           usess->domain_global.channels != NULL &&
-          usess->domain_pid != NULL &&
-          usess->domain_exec != NULL &&
           usess->uid == 0 &&
           usess->gid == 0,
           "Validate UST session");
@@ -109,9 +111,9 @@ static void test_create_ust_metadata(void)
           metadata->attr.num_subbuf
                        == DEFAULT_METADATA_SUBBUF_NUM &&
           metadata->attr.switch_timer_interval
-                       == DEFAULT_UST_CHANNEL_SWITCH_TIMER &&
+                       == DEFAULT_METADATA_SWITCH_TIMER &&
           metadata->attr.read_timer_interval
-                       == DEFAULT_UST_CHANNEL_READ_TIMER &&
+                       == DEFAULT_METADATA_READ_TIMER &&
           metadata->attr.output == LTTNG_UST_MMAP,
           "Validate UST session metadata");
 
@@ -127,11 +129,10 @@ static void test_create_ust_channel(void)
 
        strncpy(attr.name, "channel0", 8);
 
-       uchan = trace_ust_create_channel(&attr, PATH1);
+       uchan = trace_ust_create_channel(&attr);
        ok(uchan != NULL, "Create UST channel");
 
        ok(uchan->enabled == 0 &&
-          strcmp(PATH1, uchan->pathname) == 0 &&
           strncmp(uchan->name, "channel0", 8) == 0 &&
           uchan->name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0' &&
           uchan->ctx != NULL &&
@@ -181,10 +182,10 @@ static void test_create_ust_context(void)
 
 int main(int argc, char **argv)
 {
-       diag("UST data structures unit test");
-
        plan_tests(NUM_TESTS);
 
+       diag("UST data structures unit test");
+
        test_create_one_ust_session();
        test_create_ust_metadata();
        test_create_ust_channel();