X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=50d43bbd3800dc2cd0828ff4eaa7dff3d797aaac;hp=ae59c07a03caf3f82737b386557080301c434498;hb=7972aab22f74b18faa168c0482216a3dd711a075;hpb=657270a48a6b33862ead3b28f3b54d42c54c66ff

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index ae59c07a0..50d43bbd3 100644
--- 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"
@@ -82,8 +86,6 @@ static void test_create_one_ust_session(void)
 	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_CHANNEL_SWITCH_TIMER &&
+			== DEFAULT_UST_CHANNEL_SWITCH_TIMER &&
 	   metadata->attr.read_timer_interval
-			== DEFAULT_CHANNEL_READ_TIMER &&
+			== DEFAULT_UST_CHANNEL_READ_TIMER &&
 	   metadata->attr.output == LTTNG_UST_MMAP,
 	   "Validate UST session metadata");
 
@@ -131,7 +133,6 @@ static void test_create_ust_channel(void)
 	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 &&