Adding context to an event is no longer possible

[lttng-tools.git] / tests / tools / test_kernel_data_trace.c

diff --git a/tests/tools/test_kernel_data_trace.c b/tests/tools/test_kernel_data_trace.c
index 6d7f291beefbf56217ce36bbed30fdc6ec195f54..ed70f0ffb20118e1f00a3c1e72d37c7f98b3ef73 100644 (file)
--- 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,18 +89,17 @@ 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
@@ -130,7 +128,6 @@ static void create_kernel_channel(void)
        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();