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

diff --git a/tests/unit/test_kernel_data.c b/tests/unit/test_kernel_data.c
index 0b4bb08c9..132488051 100644
--- a/tests/unit/test_kernel_data.c
+++ b/tests/unit/test_kernel_data.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -33,14 +32,12 @@
 #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 ust_consumerd32_fd;
-int ust_consumerd64_fd;
+int lttng_opt_mi;
 
 static const char alphanum[] =
 	"0123456789"
@@ -72,6 +69,10 @@ static void test_create_one_kernel_session(void)
 	kern = trace_kernel_create_session();
 	ok(kern != NULL, "Create kernel session");
 
+	if (!kern) {
+		skip(1, "Kernel session is null");
+		return;
+	}
 	ok(kern->fd == -1 &&
 	   kern->metadata_stream_fd == -1 &&
 	   kern->consumer_fds_sent == 0 &&
@@ -79,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)
@@ -114,16 +112,23 @@ 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");
 
+	if (!chan) {
+		skip(1, "Channel is null");
+		return;
+	}
+
 	ok(chan->fd == -1 &&
 	   chan->enabled == 1 &&
 	   chan->stream_count == 0 &&
-	   chan->ctx == NULL &&
 	   chan->channel->attr.overwrite  == attr.attr.overwrite,
 	   "Validate kernel channel");
 
@@ -134,16 +139,24 @@ 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;
 
 	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);
-	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");
+		return;
+	}
 
 	ok(event->fd == -1 &&
 	   event->enabled == 1 &&
@@ -163,6 +176,11 @@ static void test_create_kernel_stream(void)
 	stream = trace_kernel_create_stream("stream1", 0);
 	ok(stream != NULL, "Create kernel stream");
 
+	if (!stream) {
+		skip(1, "Stream is null");
+		return;
+	}
+
 	ok(stream->fd == -1 &&
 	   stream->state == 0,
 	   "Validate kernel stream");