X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=ae8b1232a02a1b3f0f9a2095f2741c99b975fb10;hb=59891c428ea9be9b67bb80d91dacf0a3586b88ca;hp=ae59c07a03caf3f82737b386557080301c434498;hpb=657270a48a6b33862ead3b28f3b54d42c54c66ff;p=lttng-tools.git

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index ae59c07a0..ae8b1232a 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -29,11 +29,10 @@
 #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>
 
-#include "utils.h"
-
 /* This path will NEVER be created in this test */
 #define PATH1 "/tmp/.test-junk-lttng"
 
@@ -46,6 +45,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 +78,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 +109,9 @@ static void test_create_ust_metadata(void)
 	   metadata->attr.num_subbuf
 			== DEFAULT_METADATA_SUBBUF_NUM &&
 	   metadata->attr.switch_timer_interval
-			== DEFAULT_CHANNEL_SWITCH_TIMER &&
+			== DEFAULT_METADATA_SWITCH_TIMER &&
 	   metadata->attr.read_timer_interval
-			== DEFAULT_CHANNEL_READ_TIMER &&
+			== DEFAULT_METADATA_READ_TIMER &&
 	   metadata->attr.output == LTTNG_UST_MMAP,
 	   "Validate UST session metadata");
 
@@ -127,11 +127,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 &&
@@ -177,14 +176,15 @@ static void test_create_ust_context(void)
 
 	ok((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID,
 	   "Validate UST context");
+	free(uctx);
 }
 
 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();