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

[babeltrace.git] / plugins / lttng-utils / debug-info / trace-ir-metadata-copy.c

diff --git a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
index 7e9b81e2c08d08a04bb8ef05692fafc32a16c4c2..55bb953a80fd677f0bad379d470ad3eb6cef8304 100644 (file)
--- a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
+++ b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/assert-internal.h>
 
 #include "trace-ir-metadata-copy.h"
 #include "trace-ir-metadata-field-class-copy.h"
@@ -81,11 +81,12 @@ int copy_trace_class_content(const bt_trace_class *in_trace_class,
                BT_ASSERT(value_name);
                BT_ASSERT(value);
 
-               if (bt_value_is_integer(value)) {
+               if (bt_value_is_signed_integer(value)) {
                        trace_class_status =
                                bt_trace_class_set_environment_entry_integer(
                                                out_trace_class, value_name,
-                                               bt_value_integer_get(value));
+                                               bt_value_signed_integer_get(
+                                                       value));
                } else if (bt_value_is_string(value)) {
                        trace_class_status =
                                bt_trace_class_set_environment_entry_string(
@@ -254,6 +255,25 @@ int copy_stream_class_content(struct trace_ir_maps *ir_maps,
 
        }
 
+       bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
+               out_stream_class,
+               bt_stream_class_packets_have_beginning_default_clock_snapshot(
+                       in_stream_class));
+       bt_stream_class_set_packets_have_end_default_clock_snapshot(
+               out_stream_class,
+               bt_stream_class_packets_have_end_default_clock_snapshot(
+                       in_stream_class));
+       bt_stream_class_set_supports_discarded_events(
+               out_stream_class,
+               bt_stream_class_supports_discarded_events(in_stream_class),
+               bt_stream_class_discarded_events_have_default_clock_snapshots(
+                       in_stream_class));
+       bt_stream_class_set_supports_discarded_packets(
+               out_stream_class,
+               bt_stream_class_supports_discarded_packets(in_stream_class),
+               bt_stream_class_discarded_packets_have_default_clock_snapshots(
+                       in_stream_class));
+
        in_name = bt_stream_class_get_name(in_stream_class);
        if (in_name) {
                status = bt_stream_class_set_name(out_stream_class, in_name);
@@ -411,7 +431,7 @@ int copy_event_class_content(struct trace_ir_maps *ir_maps,
                out_specific_context_fc = create_field_class_copy(md_maps,
                                in_event_specific_context);
 
-               copy_field_class_content(md_maps,
+               ret = copy_field_class_content(md_maps,
                                in_event_specific_context, out_specific_context_fc);
                if (ret) {
                        goto error;
@@ -444,7 +464,7 @@ int copy_event_class_content(struct trace_ir_maps *ir_maps,
        /* Copy the payload of this event class. */
                out_payload_fc = create_field_class_copy(md_maps,
                                in_event_payload);
-               copy_field_class_content(md_maps,
+               ret = copy_field_class_content(md_maps,
                                in_event_payload, out_payload_fc);
                if (ret) {
                        goto error;