Test fix: a stream class' clock must be associated to its writer

[babeltrace.git] / tests / lib / test_ctf_ir_ref.c

diff --git a/tests/lib/test_ctf_ir_ref.c b/tests/lib/test_ctf_ir_ref.c
index 36ba4156f04f3468d5f0212cdebb4c4680ba13ad..649f559e393dd0d1f9437b496297f4eddd945a95 100644 (file)
--- a/tests/lib/test_ctf_ir_ref.c
+++ b/tests/lib/test_ctf_ir_ref.c
@@ -32,6 +32,7 @@
 #include <babeltrace/object-internal.h>
 #include <babeltrace/compat/stdlib.h>
 #include <assert.h>
+#include "common.h"
 
 #define NR_TESTS 41
 
@@ -516,11 +517,10 @@ static void create_user_full(struct user *user)
        assert(user->sc);
        clock = bt_ctf_clock_create("the_clock");
        assert(clock);
-       ret = bt_ctf_stream_class_set_clock(user->sc, clock);
+       ret = bt_ctf_writer_add_clock(user->writer, clock);
        assert(!ret);
-       ret = bt_ctf_clock_set_value(clock, 23);
+       ret = bt_ctf_stream_class_set_clock(user->sc, clock);
        assert(!ret);
-       BT_PUT(clock);
        user->stream = bt_ctf_writer_create_stream(user->writer, user->sc);
        assert(user->stream);
        user->ec = bt_ctf_event_class_create("ec");
@@ -551,6 +551,7 @@ static void create_user_full(struct user *user)
        BT_PUT(field);
        ret = bt_ctf_stream_append_event(user->stream, user->event);
        assert(!ret);
+       recursive_rmdir(trace_path);
 }
 
 static void test_put_order_swap(size_t *array, size_t a, size_t b)
@@ -565,13 +566,13 @@ static void test_put_order_put_objects(size_t *array, size_t size)
 {
        size_t i;
        struct user user = { 0 };
-       void** objects = (void *) &user;
+       void **objects = (void *) &user;
 
        create_user_full(&user);
        printf("# ");
 
        for (i = 0; i < size; ++i) {
-               void* obj = objects[array[i]];
+               void *obj = objects[array[i]];
 
                printf("%s", user_names[array[i]]);
                BT_PUT(obj);