diff mbox series

[v2] babeltrace2: upgrade 2.0.6 -> 2.1.0

Message ID 20250305104846.318301-1-bin.lan.cn@windriver.com
State New
Headers show
Series [v2] babeltrace2: upgrade 2.0.6 -> 2.1.0 | expand

Commit Message

Bin Lan March 5, 2025, 10:48 a.m. UTC
From: Bin Lan <bin.lan.cn@windriver.com>

0001-tests-do-not-run-test-applications-from-.libs.patch is deleted
for tests/lib/test_plugin is removed.

License-Update: add new license BSD-4-Clause GPL-3.0-or-later CC-BY-SA-4.0 PSF-2.0

Changelog:
Babeltrace 2.1, MIP 1 is available and adds many functions
to support CTF 2 features.
The Python bindings wrap all the library changes in the same
systematic way as in Babeltrace 2.0. Add type hints to the
public API to assist with static analysis of your applications.

Details about the 2.1.0 release:
https://babeltrace.org/docs/release-notes/babeltrace-2.1.0-release-notes.html

Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
---
v2: add License-Update tag in the commit log.
---
 ...001-Make-manpages-multilib-identical.patch |  9 ++--
 ...not-run-cpp-common-test-applications.patch | 46 +++++++++++++++++++
 ...not-run-test-applications-from-.libs.patch | 28 -----------
 ...o-not-run-test-applications-in-.libs.patch | 27 +++++++++++
 .../lttng/babeltrace2/run-ptest               |  2 +-
 ...eltrace2_2.0.6.bb => babeltrace2_2.1.0.bb} | 21 +++++++--
 6 files changed, 95 insertions(+), 38 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-cpp-common-test-applications.patch
 delete mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch
 create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch
 rename meta/recipes-kernel/lttng/{babeltrace2_2.0.6.bb => babeltrace2_2.1.0.bb} (81%)

Comments

Mathieu Dubois-Briand March 6, 2025, 7:48 a.m. UTC | #1
On Wed Mar 5, 2025 at 11:48 AM CET, Bin Lan via lists.openembedded.org wrote:
> From: Bin Lan <bin.lan.cn@windriver.com>
>
> 0001-tests-do-not-run-test-applications-from-.libs.patch is deleted
> for tests/lib/test_plugin is removed.
>
> License-Update: add new license BSD-4-Clause GPL-3.0-or-later CC-BY-SA-4.0 PSF-2.0
>
> Changelog:
> Babeltrace 2.1, MIP 1 is available and adds many functions
> to support CTF 2 features.
> The Python bindings wrap all the library changes in the same
> systematic way as in Babeltrace 2.0. Add type hints to the
> public API to assist with static analysis of your applications.
>
> Details about the 2.1.0 release:
> https://babeltrace.org/docs/release-notes/babeltrace-2.1.0-release-notes.html
>
> Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
> ---

Hi,

Thanks for your patch!

It looks like this is triggering some ptest failures, as can be seen on
the autobuilder:

Failed ptests:
{'babeltrace2': ['cli/convert/test-convert-args.sh_71_-_bad_--component_format',
                 'cli/convert/test-convert-args.sh_74_-_bad_--component_format',
                 'cli/convert/test-convert-args.sh_77_-_bad_--component_format',
                 'cli/convert/test-convert-args.sh_80_-_bad_--component_format',
                 'cli/convert/test-convert-args.sh_83_-_duplicate_component_name:_expected_error_message',
                 'cli/convert/test-convert-args.sh_86_-_unknown_option:_expected_error_message',
                 'cli/convert/test-convert-args.sh_89_-_--params_without_current_component:_expected_error_message',
                 'cli/convert/test-convert-args.sh_92_-_duplicate_--begin:_expected_error_message',
                 'cli/convert/test-convert-args.sh_95_-_duplicate_--end:_expected_error_message',
                 'cli/convert/test-convert-args.sh_98_-_--begin_and_--timerange:_expected_error_message',
                 'cli/convert/test-convert-args.sh_101_-_--end_and_--timerange:_expected_error_message',
                 'cli/convert/test-convert-args.sh_104_-_bad_--timerange_format',
                 'cli/convert/test-convert-args.sh_107_-_bad_--timerange_format',
                 'cli/convert/test-convert-args.sh_110_-_bad_--timerange_format',
                 'cli/convert/test-convert-args.sh_113_-_bad_--fields_format:_expected_error_message',
                 'cli/convert/test-convert-args.sh_116_-_bad_--names_format:_expected_error_message',
                 'cli/convert/test-convert-args.sh_119_-_unknown_-i:_expected_error_message',
                 'cli/convert/test-convert-args.sh_122_-_duplicate_-i:_expected_error_message',
                 'cli/convert/test-convert-args.sh_125_-_unknown_-o:_expected_error_message',
                 'cli/convert/test-convert-args.sh_128_-_duplicate_-o:_expected_error_message',
                 'cli/convert/test-convert-args.sh_131_-_--run-args_and_--run-args-0:_expected_error_message',
                 'cli/convert/test-convert-args.sh_134_-_-o_ctf-metadata_without_path:_expected_error_message',
                 'cli/convert/test-convert-args.sh_137_-_-i_lttng-live_and_implicit_source.ctf.fs:_expected_error_message',
                 'cli/convert/test-convert-args.sh_140_-_implicit_source.ctf.fs_without_path:_expected_error_message',
                 'cli/convert/test-convert-args.sh_143_-_implicit_source.ctf.lttng-live_without_URL:_expected_error_message',
                 'cli/convert/test-convert-args.sh_146_-_no_source:_expected_error_message',
                 'cli/convert/test-convert-args.sh_149_-_-o_ctf_without_--output:_expected_error_message',
                 'cli/convert/test-convert-args.sh_152_-_-o_ctf_+_--output_with_implicit_sink.text.pretty:_expected_error_message',
                 'cli/convert/test-convert-args.sh_155_-_--stream-intersection:_expected_error_message',
                 'cli/convert/test-convert-args.sh_158_-_two_sinks_with_-o_dummy_+_--clock-seconds:_expected_error_message',
                 'cli/convert/test-convert-args.sh_161_-_path_non-option_arg_+_user_sink_+_-o_text:_expected_error_message',
                 'cli/test-help.sh_2_-_help_ctf_plugin_expected_output',
                 'cli/test-help.sh_5_-_help_src.ctf.fs_component_class_expected_output',
                 'cli/test-help.sh_8_-_help_without_parameter_produces_expected_error',
                 'cli/test-help.sh_11_-_help_with_too_many_parameters_produces_expected_error',
                 'cli/test-help.sh_14_-_help_with_unknown_plugin_name_produces_expected_error',
                 'cli/test-help.sh_17_-_help_with_unknown_component_class_name_produces_expected_error',
                 'cli/test-help.sh_18_-_help_with_unknown_component_class_name_prints_plugin_help',
                 'cli/test-help.sh_20_-_help_with_unknown_component_class_plugin_produces_expected_error',
                 'cli/test-intersection.sh_16_-_stderr_contains_expected_error_message',
                 'cli/test-intersection.sh_20_-_stderr_contains_expected_error_message',
                 'cli/test-output-ctf-metadata.sh_2_-_Run_babeltrace_-o_ctf-metadata_with_a_valid_trace_directory,_correct_output',
                 'cli/test-packet-seq-num.sh_6_-_Lost_events_string_matches_2',
                 'cli/test-packet-seq-num.sh_8_-_Lost_events_string_matches_2',
                 'cli/test-packet-seq-num.sh_10_-_Lost_events_string_matches_2,3,1',
                 'plugins/src.ctf.fs/fail/test-fail.sh_3_-_Trace_invalid-packet-size/trace:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_4_-_Trace_invalid-packet-size/trace:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_7_-_Trace_invalid-packet-size/trace:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_8_-_Trace_invalid-packet-size/trace:_method_component:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_11_-_Trace_valid-events-then-invalid-events/trace:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_12_-_Trace_valid-events-then-invalid-events/trace:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_15_-_Trace_valid-events-then-invalid-events/trace:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_16_-_Trace_valid-events-then-invalid-events/trace:_method_component:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_19_-_Trace_metadata-syntax-error:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_20_-_Trace_metadata-syntax-error:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_23_-_Trace_metadata-syntax-error:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_24_-_Trace_metadata-syntax-error:_method_component:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_27_-_Trace_invalid-sequence-length-field-class:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_28_-_Trace_invalid-sequence-length-field-class:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_31_-_Trace_invalid-sequence-length-field-class:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_32_-_Trace_invalid-sequence-length-field-class:_method_component:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_35_-_Trace_invalid-variant-selector-field-class:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_36_-_Trace_invalid-variant-selector-field-class:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_39_-_Trace_invalid-variant-selector-field-class:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_40_-_Trace_invalid-variant-selector-field-class:_method_component:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_43_-_Trace_incomplete-packet-header:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_44_-_Trace_incomplete-packet-header:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_47_-_Trace_incomplete-packet-header:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_48_-_Trace_incomplete-packet-header:_method_component:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_51_-_Trace_meta-no-trace-cls-no-stream-cls:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_52_-_Trace_meta-no-trace-cls-no-stream-cls:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_55_-_Trace_meta-no-trace-cls-no-stream-cls:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_56_-_Trace_meta-no-trace-cls-no-stream-cls:_method_component:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_59_-_Trace_meta-no-trace-cls-no-stream-cls:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_60_-_Trace_meta-no-trace-cls-no-stream-cls:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_63_-_Trace_meta-no-trace-cls-no-stream-cls:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_64_-_Trace_meta-no-trace-cls-no-stream-cls:_method_component:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_67_-_Trace_empty-event-record:_method_autodisc:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_68_-_Trace_empty-event-record:_method_autodisc:_babeltrace_produces_the_expected_error_message',
                 'plugins/src.ctf.fs/fail/test-fail.sh_71_-_Trace_empty-event-record:_method_component:_babeltrace_produces_an_error_stack',
                 'plugins/src.ctf.fs/fail/test-fail.sh_72_-_Trace_empty-event-record:_method_component:_babeltrace_produces_the_expected_error_message',
                 "plugins/src.ctf.fs/succeed/test-succeed.sh_35_-_CTF_1:_Trace_'lttng-event-after-packet'_gives_the_expected_stdout",
                 "plugins/src.ctf.fs/succeed/test-succeed.sh_37_-_CTF_1:_Trace_'lttng-event-after-packet'_gives_the_expected_stdout",
                 "plugins/src.ctf.fs/succeed/test-succeed.sh_39_-_CTF_2:_Trace_'lttng-event-after-packet'_gives_the_expected_stdout",
                 "plugins/src.ctf.fs/succeed/test-succeed.sh_41_-_CTF_1:_Trace_'lttng-crash'_gives_the_expected_stdout",
                 "plugins/src.ctf.fs/succeed/test-succeed.sh_43_-_CTF_1:_Trace_'lttng-crash'_gives_the_expected_stdout",
                 "plugins/src.ctf.fs/succeed/test-succeed.sh_45_-_CTF_2:_Trace_'lttng-crash'_gives_the_expected_stdout",
                 "plugins/src.ctf.fs/succeed/test-succeed.sh_47_-_Trace_'clock-offset-goes-back-in-time'_gives_the_expected_output",
                 'plugins/src.ctf.fs/test-deterministic-ordering.sh_2_-_ab:_error_stack_is_produced',
                 'plugins/src.ctf.fs/test-deterministic-ordering.sh_3_-_ab:_expected_error_message_is_present',
                 'plugins/src.ctf.fs/test-deterministic-ordering.sh_5_-_ba:_error_stack_is_produced',
                 'plugins/src.ctf.fs/test-deterministic-ordering.sh_6_-_ba:_expected_error_message_is_present',
                 'plugins/src.ctf.lttng-live/test-live.sh_1_-_CLI_prints_the_expected_session_list_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_3_-_CLI_prints_the_expected_session_list',
                 'plugins/src.ctf.lttng-live/test-live.sh_5_-_CLI_attach_and_fetch_from_single-domains_session_-_no_discarded_events_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_7_-_CLI_attach_and_fetch_from_single-domains_session_-_no_discarded_events',
                 'plugins/src.ctf.lttng-live/test-live.sh_9_-_CLI_attach_and_fetch_from_multi-domains_session_-_discarded_events_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_11_-_CLI_attach_and_fetch_from_multi-domains_session_-_discarded_events',
                 'plugins/src.ctf.lttng-live/test-live.sh_13_-_CLI_many_requests_per_packet_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_15_-_CLI_src.ctf.fs_vs_src.ctf.lttng-live_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_17_-_CLI_src.ctf.fs_vs_src.ctf.lttng-live_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_19_-_CLI_attach_and_fetch_from_single-domains_session_-_inactivity_discarded_packet_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_21_-_CLI_attach_and_fetch_from_single-domain_session_-_Receive_metadata_in_two_sections_separated_by_a_empty_section_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_23_-_split_metadata_requiring_additional_stored_values_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_25_-_new_stream_announced_while_an_existing_stream_is_inactive_-_stdout',
                 'plugins/src.ctf.lttng-live/test-live.sh_28_-_invalid_metadata_sent_by_the_relay_-_stderr',
                 'cli/convert/test-convert-args.sh',
                 'cli/test-help.sh',
                 'cli/test-intersection.sh',
                 'cli/test-output-ctf-metadata.sh',
                 'cli/test-packet-seq-num.sh',
                 'plugins/src.ctf.fs/fail/test-fail.sh',
                 'plugins/src.ctf.fs/succeed/test-succeed.sh',
                 'plugins/src.ctf.fs/test-deterministic-ordering.sh',
                 'plugins/src.ctf.lttng-live/test-live.sh']}

https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/1058/steps/12/logs/stdio

Extra log data can be found in: https://valkyrie.yocto.io/pub/non-release/20250305-106/testresults/qemux86-64-ptest/core-image-ptest-babeltrace2/

Can you have a look at this failure please?
Bin Lan March 6, 2025, 9:02 a.m. UTC | #2
On 3/6/25 15:48, Mathieu Dubois-Briand wrote:
> On Wed Mar 5, 2025 at 11:48 AM CET, Bin Lan via lists.openembedded.org wrote:
>> From: Bin Lan <bin.lan.cn@windriver.com>
>>
>> 0001-tests-do-not-run-test-applications-from-.libs.patch is deleted
>> for tests/lib/test_plugin is removed.
>>
>> License-Update: add new license BSD-4-Clause GPL-3.0-or-later CC-BY-SA-4.0 PSF-2.0
>>
>> Changelog:
>> Babeltrace 2.1, MIP 1 is available and adds many functions
>> to support CTF 2 features.
>> The Python bindings wrap all the library changes in the same
>> systematic way as in Babeltrace 2.0. Add type hints to the
>> public API to assist with static analysis of your applications.
>>
>> Details about the 2.1.0 release:
>> https://babeltrace.org/docs/release-notes/babeltrace-2.1.0-release-notes.html
>>
>> Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
>> ---
> Hi,
>
> Thanks for your patch!
>
> It looks like this is triggering some ptest failures, as can be seen on
> the autobuilder:
>
> Failed ptests:
> {'babeltrace2': ['cli/convert/test-convert-args.sh_71_-_bad_--component_format',
>                   'cli/convert/test-convert-args.sh_74_-_bad_--component_format',
>                   'cli/convert/test-convert-args.sh_77_-_bad_--component_format',
>                   'cli/convert/test-convert-args.sh_80_-_bad_--component_format',
>                   'cli/convert/test-convert-args.sh_83_-_duplicate_component_name:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_86_-_unknown_option:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_89_-_--params_without_current_component:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_92_-_duplicate_--begin:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_95_-_duplicate_--end:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_98_-_--begin_and_--timerange:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_101_-_--end_and_--timerange:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_104_-_bad_--timerange_format',
>                   'cli/convert/test-convert-args.sh_107_-_bad_--timerange_format',
>                   'cli/convert/test-convert-args.sh_110_-_bad_--timerange_format',
>                   'cli/convert/test-convert-args.sh_113_-_bad_--fields_format:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_116_-_bad_--names_format:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_119_-_unknown_-i:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_122_-_duplicate_-i:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_125_-_unknown_-o:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_128_-_duplicate_-o:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_131_-_--run-args_and_--run-args-0:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_134_-_-o_ctf-metadata_without_path:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_137_-_-i_lttng-live_and_implicit_source.ctf.fs:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_140_-_implicit_source.ctf.fs_without_path:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_143_-_implicit_source.ctf.lttng-live_without_URL:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_146_-_no_source:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_149_-_-o_ctf_without_--output:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_152_-_-o_ctf_+_--output_with_implicit_sink.text.pretty:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_155_-_--stream-intersection:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_158_-_two_sinks_with_-o_dummy_+_--clock-seconds:_expected_error_message',
>                   'cli/convert/test-convert-args.sh_161_-_path_non-option_arg_+_user_sink_+_-o_text:_expected_error_message',
>                   'cli/test-help.sh_2_-_help_ctf_plugin_expected_output',
>                   'cli/test-help.sh_5_-_help_src.ctf.fs_component_class_expected_output',
>                   'cli/test-help.sh_8_-_help_without_parameter_produces_expected_error',
>                   'cli/test-help.sh_11_-_help_with_too_many_parameters_produces_expected_error',
>                   'cli/test-help.sh_14_-_help_with_unknown_plugin_name_produces_expected_error',
>                   'cli/test-help.sh_17_-_help_with_unknown_component_class_name_produces_expected_error',
>                   'cli/test-help.sh_18_-_help_with_unknown_component_class_name_prints_plugin_help',
>                   'cli/test-help.sh_20_-_help_with_unknown_component_class_plugin_produces_expected_error',
>                   'cli/test-intersection.sh_16_-_stderr_contains_expected_error_message',
>                   'cli/test-intersection.sh_20_-_stderr_contains_expected_error_message',
>                   'cli/test-output-ctf-metadata.sh_2_-_Run_babeltrace_-o_ctf-metadata_with_a_valid_trace_directory,_correct_output',
>                   'cli/test-packet-seq-num.sh_6_-_Lost_events_string_matches_2',
>                   'cli/test-packet-seq-num.sh_8_-_Lost_events_string_matches_2',
>                   'cli/test-packet-seq-num.sh_10_-_Lost_events_string_matches_2,3,1',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_3_-_Trace_invalid-packet-size/trace:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_4_-_Trace_invalid-packet-size/trace:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_7_-_Trace_invalid-packet-size/trace:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_8_-_Trace_invalid-packet-size/trace:_method_component:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_11_-_Trace_valid-events-then-invalid-events/trace:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_12_-_Trace_valid-events-then-invalid-events/trace:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_15_-_Trace_valid-events-then-invalid-events/trace:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_16_-_Trace_valid-events-then-invalid-events/trace:_method_component:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_19_-_Trace_metadata-syntax-error:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_20_-_Trace_metadata-syntax-error:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_23_-_Trace_metadata-syntax-error:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_24_-_Trace_metadata-syntax-error:_method_component:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_27_-_Trace_invalid-sequence-length-field-class:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_28_-_Trace_invalid-sequence-length-field-class:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_31_-_Trace_invalid-sequence-length-field-class:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_32_-_Trace_invalid-sequence-length-field-class:_method_component:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_35_-_Trace_invalid-variant-selector-field-class:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_36_-_Trace_invalid-variant-selector-field-class:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_39_-_Trace_invalid-variant-selector-field-class:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_40_-_Trace_invalid-variant-selector-field-class:_method_component:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_43_-_Trace_incomplete-packet-header:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_44_-_Trace_incomplete-packet-header:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_47_-_Trace_incomplete-packet-header:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_48_-_Trace_incomplete-packet-header:_method_component:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_51_-_Trace_meta-no-trace-cls-no-stream-cls:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_52_-_Trace_meta-no-trace-cls-no-stream-cls:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_55_-_Trace_meta-no-trace-cls-no-stream-cls:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_56_-_Trace_meta-no-trace-cls-no-stream-cls:_method_component:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_59_-_Trace_meta-no-trace-cls-no-stream-cls:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_60_-_Trace_meta-no-trace-cls-no-stream-cls:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_63_-_Trace_meta-no-trace-cls-no-stream-cls:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_64_-_Trace_meta-no-trace-cls-no-stream-cls:_method_component:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_67_-_Trace_empty-event-record:_method_autodisc:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_68_-_Trace_empty-event-record:_method_autodisc:_babeltrace_produces_the_expected_error_message',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_71_-_Trace_empty-event-record:_method_component:_babeltrace_produces_an_error_stack',
>                   'plugins/src.ctf.fs/fail/test-fail.sh_72_-_Trace_empty-event-record:_method_component:_babeltrace_produces_the_expected_error_message',
>                   "plugins/src.ctf.fs/succeed/test-succeed.sh_35_-_CTF_1:_Trace_'lttng-event-after-packet'_gives_the_expected_stdout",
>                   "plugins/src.ctf.fs/succeed/test-succeed.sh_37_-_CTF_1:_Trace_'lttng-event-after-packet'_gives_the_expected_stdout",
>                   "plugins/src.ctf.fs/succeed/test-succeed.sh_39_-_CTF_2:_Trace_'lttng-event-after-packet'_gives_the_expected_stdout",
>                   "plugins/src.ctf.fs/succeed/test-succeed.sh_41_-_CTF_1:_Trace_'lttng-crash'_gives_the_expected_stdout",
>                   "plugins/src.ctf.fs/succeed/test-succeed.sh_43_-_CTF_1:_Trace_'lttng-crash'_gives_the_expected_stdout",
>                   "plugins/src.ctf.fs/succeed/test-succeed.sh_45_-_CTF_2:_Trace_'lttng-crash'_gives_the_expected_stdout",
>                   "plugins/src.ctf.fs/succeed/test-succeed.sh_47_-_Trace_'clock-offset-goes-back-in-time'_gives_the_expected_output",
>                   'plugins/src.ctf.fs/test-deterministic-ordering.sh_2_-_ab:_error_stack_is_produced',
>                   'plugins/src.ctf.fs/test-deterministic-ordering.sh_3_-_ab:_expected_error_message_is_present',
>                   'plugins/src.ctf.fs/test-deterministic-ordering.sh_5_-_ba:_error_stack_is_produced',
>                   'plugins/src.ctf.fs/test-deterministic-ordering.sh_6_-_ba:_expected_error_message_is_present',
>                   'plugins/src.ctf.lttng-live/test-live.sh_1_-_CLI_prints_the_expected_session_list_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_3_-_CLI_prints_the_expected_session_list',
>                   'plugins/src.ctf.lttng-live/test-live.sh_5_-_CLI_attach_and_fetch_from_single-domains_session_-_no_discarded_events_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_7_-_CLI_attach_and_fetch_from_single-domains_session_-_no_discarded_events',
>                   'plugins/src.ctf.lttng-live/test-live.sh_9_-_CLI_attach_and_fetch_from_multi-domains_session_-_discarded_events_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_11_-_CLI_attach_and_fetch_from_multi-domains_session_-_discarded_events',
>                   'plugins/src.ctf.lttng-live/test-live.sh_13_-_CLI_many_requests_per_packet_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_15_-_CLI_src.ctf.fs_vs_src.ctf.lttng-live_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_17_-_CLI_src.ctf.fs_vs_src.ctf.lttng-live_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_19_-_CLI_attach_and_fetch_from_single-domains_session_-_inactivity_discarded_packet_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_21_-_CLI_attach_and_fetch_from_single-domain_session_-_Receive_metadata_in_two_sections_separated_by_a_empty_section_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_23_-_split_metadata_requiring_additional_stored_values_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_25_-_new_stream_announced_while_an_existing_stream_is_inactive_-_stdout',
>                   'plugins/src.ctf.lttng-live/test-live.sh_28_-_invalid_metadata_sent_by_the_relay_-_stderr',
>                   'cli/convert/test-convert-args.sh',
>                   'cli/test-help.sh',
>                   'cli/test-intersection.sh',
>                   'cli/test-output-ctf-metadata.sh',
>                   'cli/test-packet-seq-num.sh',
>                   'plugins/src.ctf.fs/fail/test-fail.sh',
>                   'plugins/src.ctf.fs/succeed/test-succeed.sh',
>                   'plugins/src.ctf.fs/test-deterministic-ordering.sh',
>                   'plugins/src.ctf.lttng-live/test-live.sh']}
>
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/1058/steps/12/logs/stdio
>
> Extra log data can be found in: https://valkyrie.yocto.io/pub/non-release/20250305-106/testresults/qemux86-64-ptest/core-image-ptest-babeltrace2/
>
> Can you have a look at this failure please?

Some new failed test cases are disabled for I have not time to fix it 
before the feature freeze to investigate.

I have sent out a v3 patch, all test cases are passed when running in 
intel-x86-64 board. Please review it. Thanks.

--

Bin Lan

>
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
diff mbox series

Patch

diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
index 2401b176e6..76bef9c3b8 100644
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
@@ -5,15 +5,17 @@  Subject: [PATCH] Make manpages multilib identical
 
 Upstream-Status: Pending
 Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
+Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
 ---
  doc/man/asciidoc-attrs.conf.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in
-index ad1183f1..e11c7031 100644
+index 88fb13ce2..27858b720 100644
 --- a/doc/man/asciidoc-attrs.conf.in
 +++ b/doc/man/asciidoc-attrs.conf.in
-@@ -1,7 +1,7 @@
+@@ -4,8 +4,8 @@
+
  [attributes]
  # default values
 -system_plugin_path="@LIBDIR@/babeltrace2/plugins"
@@ -24,5 +26,4 @@  index ad1183f1..e11c7031 100644
  enable_debug_info="@ENABLE_DEBUG_INFO_VAL@"
  defrdport=5344
 -- 
-2.24.1
-
+2.34.1
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-cpp-common-test-applications.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-cpp-common-test-applications.patch
new file mode 100644
index 0000000000..a133826792
--- /dev/null
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-cpp-common-test-applications.patch
@@ -0,0 +1,46 @@ 
+From a68641947aa5a8b11c81445a9f79d3018bc79893 Mon Sep 17 00:00:00 2001
+From: Bin Lan <bin.lan.cn@windriver.com>
+Date: Wed, 5 Mar 2025 10:41:42 +0800
+Subject: [PATCH] tests: do not run cpp common test applications
+
+These cpp common test applications are needed to re-build in the target.
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
+---
+ tests/Makefile.am | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 2a4022bc4..8a23bc8f7 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -128,10 +128,11 @@ cpp_common_test_unicode_conv_LDADD = \
+ 	$(top_builddir)/src/lib/libbabeltrace2.la \
+ 	$(COMMON_TEST_LDADD)
+ 
+-TESTS_CPP_COMMON = \
+-	cpp-common/test-c-string-view \
+-	cpp-common/test-uuid \
+-	cpp-common/test-unicode-conv
++TESTS_CPP_COMMON =
++#TESTS_CPP_COMMON = \
++#	cpp-common/test-c-string-view \
++#	cpp-common/test-uuid \
++#	cpp-common/test-unicode-conv
+ 
+ TESTS_LIB = \
+ 	lib/test-bt-uuid \
+@@ -272,7 +273,7 @@ endef
+ $(eval $(call check_target,bindings,$(TESTS_BINDINGS)))
+ $(eval $(call check_target,bitfield,$(TESTS_BITFIELD)))
+ $(eval $(call check_target,cli,$(TESTS_CLI)))
+-$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON)))
++#$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON)))
+ $(eval $(call check_target,ctf-writer,$(TESTS_CTF_WRITER)))
+ $(eval $(call check_target,lib,$(TESTS_LIB)))
+ $(eval $(call check_target,plugins,$(TESTS_PLUGINS)))
+-- 
+2.34.1
+
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch
deleted file mode 100644
index 805dde8064..0000000000
--- a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch
+++ /dev/null
@@ -1,28 +0,0 @@ 
-From 582713cc9a013481eeef253195d644020f637ec4 Mon Sep 17 00:00:00 2001
-Message-Id: <582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux@gmail.com>
-From: Anders Wallin <wallinux@gmail.com>
-Date: Thu, 5 Mar 2020 11:20:04 +0100
-Subject: [PATCH] tests: do not run test applications from .libs
-
-Cross compile specific change
-
-Upstream-Status: Inappropriate [oe-core specific]
-
-Signed-off-by: Anders Wallin <wallinux@gmail.com>
----
- tests/lib/test_plugin | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin
-index 652c90cc..1f817c50 100755
---- a/tests/lib/test_plugin
-+++ b/tests/lib/test_plugin
-@@ -26,4 +26,4 @@ fi
- # shellcheck source=../utils/utils.sh
- source "$UTILSSH"
- 
--"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs"
-+"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins"
--- 
-2.25.1
-
diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch
new file mode 100644
index 0000000000..36d7184e97
--- /dev/null
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-in-.libs.patch
@@ -0,0 +1,27 @@ 
+From 32494b1726a881883cb6d317ab76d1ec3f1fa740 Mon Sep 17 00:00:00 2001
+From: Bin Lan <bin.lan.cn@windriver.com>
+Date: Wed, 5 Mar 2025 10:51:11 +0800
+Subject: [PATCH] tests: do not run test applications in .libs
+
+.libs is not exist when cross build.
+
+Upstream-Status: Inappropriate [oe-core specific]
+
+Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
+---
+ tests/lib/test-plugins.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/lib/test-plugins.sh b/tests/lib/test-plugins.sh
+index f83e42baa..939236393 100755
+--- a/tests/lib/test-plugins.sh
++++ b/tests/lib/test-plugins.sh
+@@ -14,4 +14,4 @@ fi
+ # shellcheck source=../utils/utils.sh
+ source "$UTILSSH"
+ 
+-"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins/.libs"
++"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins"
+-- 
+2.34.1
+
diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest
index 71a9c81bfb..f3796d4340 100755
--- a/meta/recipes-kernel/lttng/babeltrace2/run-ptest
+++ b/meta/recipes-kernel/lttng/babeltrace2/run-ptest
@@ -16,4 +16,4 @@  if [ -e tests/test-suite.log ]; then
     cat tests/test-suite.log
 fi
 
-exit $exitcode
\ No newline at end of file
+exit $exitcode
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb b/meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb
similarity index 81%
rename from meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb
rename to meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb
index a50ba8fcdf..793301f46e 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.1.0.bb
@@ -2,17 +2,18 @@  SUMMARY = "Babeltrace2 - Trace Format Babel Tower"
 DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log."
 HOMEPAGE = "http://babeltrace.org/"
 BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace"
-LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e"
+LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause & BSD-4-Clause & GPL-3.0-or-later & CC-BY-SA-4.0 & PSF-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f6b015e4f388d6e78adb1b1f9a887d06"
 
 DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
 
-SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=https \
+SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=https \
            file://run-ptest \
-           file://0001-tests-do-not-run-test-applications-from-.libs.patch \
            file://0001-Make-manpages-multilib-identical.patch \
+           file://0001-tests-do-not-run-cpp-common-test-applications.patch \
+           file://0001-tests-do-not-run-test-applications-in-.libs.patch \
            "
-SRCREV = "0a6632f77801f3218a288604c646f8a39cb0d2c4"
+SRCREV = "e61d41ff3c3ac6a123930d4e60cf710ff9ea18e0"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
 
 S = "${WORKDIR}/git"
@@ -33,6 +34,14 @@  LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', '-fuse-ld
 # coreutils since we need full mktemp
 RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils"
 
+do_configure:append() {
+    # when doing cross compile, the path ${B}/src/plugins/ctf/common/src/metadata/tsdl
+    # is not created by the babeltrace2 build system. It is need when generating
+    # parser.cpp by executing /bin/bash ../../git/config/ylwrap.
+    # So make this directory after configuration.
+    mkdir -p ${B}/src/plugins/ctf/common/src/metadata/tsdl
+}
+
 do_compile_ptest () {
     make -C tests all
 }
@@ -93,3 +102,5 @@  do_install_ptest () {
     # Remove architechture specific testfiles
     rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/*
 }
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"