tap-driver.sh: flush stdout after each test result

[babeltrace.git] / plugins / ctf / common / metadata / ctf-meta-translate.c

diff --git a/plugins/ctf/common/metadata/ctf-meta-translate.c b/plugins/ctf/common/metadata/ctf-meta-translate.c
index e8486f96108d40147fe657cb5c581d43695f7fbf..ca3069aee13bd1ab8091b6b9f5078247ad2d890a 100644 (file)
--- a/plugins/ctf/common/metadata/ctf-meta-translate.c
+++ b/plugins/ctf/common/metadata/ctf-meta-translate.c
@@ -15,9 +15,9 @@
 #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-TRANSLATE"
 #include "logging.h"
 
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
@@ -485,12 +485,18 @@ void ctf_stream_class_to_ir(struct ctx *ctx)
                ret = bt_stream_class_set_default_clock_class(ctx->ir_sc,
                        ctx->sc->default_clock_class->ir_cc);
                BT_ASSERT(ret == 0);
-               bt_stream_class_set_packets_have_default_beginning_clock_snapshot(
-                       ctx->ir_sc, BT_TRUE);
-               bt_stream_class_set_packets_have_default_end_clock_snapshot(
-                       ctx->ir_sc, BT_TRUE);
        }
 
+       bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
+               ctx->ir_sc, ctx->sc->packets_have_ts_begin);
+       bt_stream_class_set_packets_have_end_default_clock_snapshot(
+               ctx->ir_sc, ctx->sc->packets_have_ts_end);
+       bt_stream_class_set_supports_discarded_events(ctx->ir_sc,
+               ctx->sc->has_discarded_events,
+               ctx->sc->discarded_events_have_default_cs);
+       bt_stream_class_set_supports_discarded_packets(ctx->ir_sc,
+               ctx->sc->has_discarded_packets,
+               ctx->sc->discarded_packets_have_default_cs);
        ctx->sc->is_translated = true;
        ctx->sc->ir_sc = ctx->ir_sc;