X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_kernel_data.c;h=0bae53ae768c924f0bd56c1dbd7ef1b191198201;hb=a404b1e676f145e32d98a6d6b17f927b3f91ee6b;hp=c9dc194d0ca4b449a6837065dfbf9c8150dec91c;hpb=7972aab22f74b18faa168c0482216a3dd711a075;p=lttng-tools.git

diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c
index c9dc194d0..0bae53ae7 100644
--- a/tests/unit/test_kernel_data.c
+++ b/tests/unit/test_kernel_data.c
@@ -30,17 +30,15 @@
 
 #include <tap/tap.h>
 
-/* This path will NEVER be created in this test */
-#define PATH1 "/tmp/.test-junk-lttng"
-
 #define RANDOM_STRING_LEN	11
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 10
+#define NUM_TESTS 11
 
-/* For lttngerr.h */
+/* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
+int lttng_opt_mi;
 
 int ust_consumerd32_fd;
 int ust_consumerd64_fd;
@@ -72,7 +70,7 @@ static char *get_random_string(void)
 
 static void test_create_one_kernel_session(void)
 {
-	kern = trace_kernel_create_session(PATH1);
+	kern = trace_kernel_create_session();
 	ok(kern != NULL, "Create kernel session");
 
 	ok(kern->fd == -1 &&
@@ -82,9 +80,6 @@ static void test_create_one_kernel_session(void)
 	   kern->stream_count_global == 0 &&
 	   kern->metadata == NULL,
 	   "Validate kernel session");
-
-	/* Init list in order to avoid sefaults from cds_list_del */
-	trace_kernel_destroy_session(kern);
 }
 
 static void test_create_kernel_metadata(void)
@@ -126,7 +121,6 @@ static void test_create_kernel_channel(void)
 	ok(chan->fd == -1 &&
 	   chan->enabled == 1 &&
 	   chan->stream_count == 0 &&
-	   chan->ctx == NULL &&
 	   chan->channel->attr.overwrite  == attr.attr.overwrite,
 	   "Validate kernel channel");
 
@@ -141,11 +135,13 @@ static void test_create_kernel_event(void)
 	struct lttng_event ev;
 
 	memset(&ev, 0, sizeof(ev));
-	strncpy(ev.name, get_random_string(), LTTNG_KERNEL_SYM_NAME_LEN);
+	ok(!lttng_strncpy(ev.name, get_random_string(),
+			LTTNG_KERNEL_SYM_NAME_LEN),
+		"Validate string length");
 	ev.type = LTTNG_EVENT_TRACEPOINT;
 	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
-	event = trace_kernel_create_event(&ev);
+	event = trace_kernel_create_event(&ev, NULL, NULL);
 	ok(event != NULL, "Create kernel event");
 
 	ok(event->fd == -1 &&
@@ -177,10 +173,10 @@ static void test_create_kernel_stream(void)
 
 int main(int argc, char **argv)
 {
-	diag("Kernel data structure unit test");
-
 	plan_tests(NUM_TESTS);
 
+	diag("Kernel data structure unit test");
+
 	test_create_one_kernel_session();
 	test_create_kernel_metadata();
 	test_create_kernel_channel();