X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_kernel_data.c;h=132488051324ad7aa9fed5a5167d9c4b8fd8e042;hp=6a35ea54a602489df1d35df9995a6f6cad5f8a14;hb=44cdb3a261262ebabea3fb0cae9360ac05e66f2c;hpb=84a7eb731975042c535645dd747a51825b302f93

diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c
index 6a35ea54a..132488051 100644
--- a/tests/unit/test_kernel_data.c
+++ b/tests/unit/test_kernel_data.c
@@ -39,9 +39,6 @@ int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 int lttng_opt_mi;
 
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
 static const char alphanum[] =
 	"0123456789"
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -115,8 +112,11 @@ static void test_create_kernel_channel(void)
 {
 	struct ltt_kernel_channel *chan;
 	struct lttng_channel attr;
+	struct lttng_channel_extended extended;
 
 	memset(&attr, 0, sizeof(attr));
+	memset(&extended, 0, sizeof(extended));
+	attr.attr.extended.ptr = &extended;
 
 	chan = trace_kernel_create_channel(&attr);
 	ok(chan != NULL, "Create kernel channel");
@@ -139,6 +139,7 @@ static void test_create_kernel_channel(void)
 
 static void test_create_kernel_event(void)
 {
+	enum lttng_error_code ret;
 	struct ltt_kernel_event *event;
 	struct lttng_event ev;
 
@@ -149,8 +150,8 @@ static void test_create_kernel_event(void)
 	ev.type = LTTNG_EVENT_TRACEPOINT;
 	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
-	event = trace_kernel_create_event(&ev, NULL, NULL);
-	ok(event != NULL, "Create kernel event");
+	ret = trace_kernel_create_event(&ev, NULL, NULL, &event);
+	ok(ret == LTTNG_OK, "Create kernel event");
 
 	if (!event) {
 		skip(1, "Event is null");