X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Ftools%2Ftest_kernel_data_trace.c;h=db2064e226f120c935dd912cc1b20ce2e0822d5d;hb=ffadb7d34f0cfd59405e075d84dc10512e832446;hp=6d7f291beefbf56217ce36bbed30fdc6ec195f54;hpb=355f483d1713d1e047ad6256bea039cb693ae38e;p=lttng-tools.git

diff --git a/tests/tools/test_kernel_data_trace.c b/tests/tools/test_kernel_data_trace.c
index 6d7f291be..db2064e22 100644
--- a/tests/tools/test_kernel_data_trace.c
+++ b/tests/tools/test_kernel_data_trace.c
@@ -78,7 +78,6 @@ static void create_one_kernel_session(void)
 	assert(kern->channel_count == 0);
 	assert(kern->stream_count_global == 0);
 	assert(kern->metadata == NULL);
-	assert(kern->consumer_fd == -1);
 	PRINT_OK();
 
 	/* Init list in order to avoid sefaults from cds_list_del */
@@ -90,24 +89,23 @@ static void create_kernel_metadata(void)
 	assert(kern != NULL);
 
 	printf("Create kernel metadata: ");
-	kern->metadata = trace_kernel_create_metadata(PATH1);
+	kern->metadata = trace_kernel_create_metadata();
 	assert(kern->metadata != NULL);
 	PRINT_OK();
 
 	printf("Validating kernel session metadata: ");
 	assert(kern->metadata->fd == -1);
-	assert(strlen(kern->metadata->pathname));
 	assert(kern->metadata->conf != NULL);
 	assert(kern->metadata->conf->attr.overwrite
 			== DEFAULT_CHANNEL_OVERWRITE);
 	assert(kern->metadata->conf->attr.subbuf_size
-			== DEFAULT_METADATA_SUBBUF_SIZE);
+			== default_get_metadata_subbuf_size());
 	assert(kern->metadata->conf->attr.num_subbuf
 			== DEFAULT_METADATA_SUBBUF_NUM);
 	assert(kern->metadata->conf->attr.switch_timer_interval
-			== DEFAULT_CHANNEL_SWITCH_TIMER);
+			== DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER);
 	assert(kern->metadata->conf->attr.read_timer_interval
-			== DEFAULT_CHANNEL_READ_TIMER);
+			== DEFAULT_KERNEL_CHANNEL_READ_TIMER);
 	assert(kern->metadata->conf->attr.output
 			== DEFAULT_KERNEL_CHANNEL_OUTPUT);
 	PRINT_OK();
@@ -123,14 +121,13 @@ static void create_kernel_channel(void)
 	memset(&attr, 0, sizeof(attr));
 
 	printf("Creating kernel channel: ");
-	chan = trace_kernel_create_channel(&attr, PATH1);
+	chan = trace_kernel_create_channel(&attr);
 	assert(chan != NULL);
 	PRINT_OK();
 
 	printf("Validating kernel channel: ");
 	assert(chan->fd == -1);
 	assert(chan->enabled == 1);
-	assert(strcmp(PATH1, chan->pathname) == 0);
 	assert(chan->stream_count == 0);
 	assert(chan->ctx == NULL);
 	assert(chan->channel->attr.overwrite  == attr.attr.overwrite);
@@ -159,7 +156,6 @@ static void create_kernel_event(void)
 	printf("Validating kernel event: ");
 	assert(event->fd == -1);
 	assert(event->enabled == 1);
-	assert(event->ctx == NULL);
 	assert(event->event->instrumentation == LTTNG_KERNEL_TRACEPOINT);
 	assert(strlen(event->event->name));
 	PRINT_OK();
@@ -174,13 +170,12 @@ static void create_kernel_stream(void)
 	struct ltt_kernel_stream *stream;
 
 	printf("Creating kernel stream: ");
-	stream = trace_kernel_create_stream();
+	stream = trace_kernel_create_stream("stream1", 0);
 	assert(stream != NULL);
 	PRINT_OK();
 
 	printf("Validating kernel stream: ");
 	assert(stream->fd == -1);
-	assert(stream->pathname == NULL);
 	assert(stream->state == 0);
 	PRINT_OK();