X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_kernel_data.c;h=533cbbc0f59c214719247cfc94dd7b09b851e866;hb=8a489ef928a15fd3cd18341340228874a4c94d27;hp=412e4004f9d09fcea583d2a79a5dba773f974bf7;hpb=71a3bb01e288ad6e611be0501a4444375c4124a7;p=lttng-tools.git

diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c
index 412e4004f..533cbbc0f 100644
--- a/tests/unit/test_kernel_data.c
+++ b/tests/unit/test_kernel_data.c
@@ -38,10 +38,6 @@
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 int lttng_opt_mi;
-struct notification_thread_handle *notification_thread_handle;
-
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
 
 static const char alphanum[] =
 	"0123456789"
@@ -96,17 +92,17 @@ static void test_create_kernel_metadata(void)
 	ok(kern->metadata->fd == -1 &&
 	   kern->metadata->conf != NULL &&
 	   kern->metadata->conf->attr.overwrite
-			== DEFAULT_CHANNEL_OVERWRITE &&
+			== DEFAULT_METADATA_OVERWRITE &&
 	   kern->metadata->conf->attr.subbuf_size
 			== default_get_metadata_subbuf_size() &&
 	   kern->metadata->conf->attr.num_subbuf
 			== DEFAULT_METADATA_SUBBUF_NUM &&
 	   kern->metadata->conf->attr.switch_timer_interval
-			== DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER &&
+			== DEFAULT_METADATA_SWITCH_TIMER &&
 	   kern->metadata->conf->attr.read_timer_interval
-			== DEFAULT_KERNEL_CHANNEL_READ_TIMER &&
+			== DEFAULT_METADATA_READ_TIMER &&
 	   kern->metadata->conf->attr.output
-	       == DEFAULT_KERNEL_CHANNEL_OUTPUT,
+			== LTTNG_EVENT_MMAP,
 	   "Validate kernel session metadata");
 
 	trace_kernel_destroy_metadata(kern->metadata);
@@ -149,7 +145,7 @@ static void test_create_kernel_event(void)
 
 	memset(&ev, 0, sizeof(ev));
 	ok(!lttng_strncpy(ev.name, get_random_string(),
-			LTTNG_KERNEL_SYM_NAME_LEN),
+			RANDOM_STRING_LEN),
 		"Validate string length");
 	ev.type = LTTNG_EVENT_TRACEPOINT;
 	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
@@ -206,6 +202,5 @@ int main(int argc, char **argv)
 	test_create_kernel_event();
 	test_create_kernel_stream();
 
-	/* Success */
-	return 0;
+	return exit_status();
 }