X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=7c48c5cb35637e5017add8ed6e876dacd5f75c0e;hp=294b5c58941d7ab8eee7ee4b2d34f33ae0ca9fa7;hb=561c68970ca461ccf8451aee47efc29da20ad8f1;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index 294b5c589..7c48c5cb3 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -33,8 +33,6 @@
 
 #include <tap/tap.h>
 
-#include "utils.h"
-
 /* This path will NEVER be created in this test */
 #define PATH1 "/tmp/.test-junk-lttng"
 
@@ -80,7 +78,7 @@ 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 &&
@@ -111,9 +109,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");
 
@@ -129,7 +127,7 @@ 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 &&
@@ -153,7 +151,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);
+	event = trace_ust_create_event(&ev, NULL, NULL);
 
 	ok(event != NULL, "Create UST event");
 
@@ -178,6 +176,7 @@ 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)