From 395a08d053824112b01910bffdb0020e7c00385b Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 2 Oct 2017 16:03:40 -0400 Subject: [PATCH] flt.lttng-utils.debug-info: `dir`/`debug-dir` param -> `debug-info-dir` MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- cli/babeltrace-cfg-cli-args.c | 2 +- plugins/lttng-utils/plugin.c | 4 ++-- tests/cli/test_convert_args.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c index c1570634..da60680a 100644 --- a/cli/babeltrace-cfg-cli-args.c +++ b/cli/babeltrace-cfg-cli-args.c @@ -4104,7 +4104,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], case OPT_DEBUG_INFO_DIR: implicit_debug_info_args.exists = true; ret = append_implicit_component_extra_param( - &implicit_debug_info_args, "dir", arg); + &implicit_debug_info_args, "debug-info-dir", arg); if (ret) { goto error; } diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c index d12f5d5a..266b4471 100644 --- a/plugins/lttng-utils/plugin.c +++ b/plugins/lttng-utils/plugin.c @@ -361,7 +361,7 @@ enum bt_component_status init_from_params( goto end; } - value = bt_value_map_get(params, "debug-dir"); + value = bt_value_map_get(params, "debug-info-dir"); if (value) { enum bt_value_status value_ret; @@ -369,7 +369,7 @@ enum bt_component_status init_from_params( &debug_info_component->arg_debug_dir); if (value_ret) { ret = BT_COMPONENT_STATUS_INVALID; - BT_LOGE_STR("Failed to retrieve debug-dir value. " + BT_LOGE_STR("Failed to retrieve debug-info-dir value. " "Expecting a string."); } } diff --git a/tests/cli/test_convert_args.in b/tests/cli/test_convert_args.in index d7532950..0111f36c 100644 --- a/tests/cli/test_convert_args.in +++ b/tests/cli/test_convert_args.in @@ -101,7 +101,7 @@ test_bt_convert_run_args 'path leftover + --clock-offset-ns' "$path_to_trace --c test_bt_convert_run_args 'path leftover + --clock-seconds' "$path_to_trace --clock-seconds" "--component source.ctf.fs --name source-ctf-fs --key path --value $path_to_trace --component sink.text.pretty --name pretty --params clock-seconds=yes --component filter.utils.muxer --name muxer --connect source-ctf-fs:muxer --connect muxer:pretty" test_bt_convert_run_args 'path leftover + --color' "$path_to_trace --color=never" "--component source.ctf.fs --name source-ctf-fs --key path --value $path_to_trace --component sink.text.pretty --name pretty --key color --value never --component filter.utils.muxer --name muxer --connect source-ctf-fs:muxer --connect muxer:pretty" test_bt_convert_run_args 'path leftover + --debug-info' "$path_to_trace --debug-info" "--component source.ctf.fs --name source-ctf-fs --key path --value $path_to_trace --component sink.text.pretty --name pretty --component filter.utils.muxer --name muxer --component filter.lttng-utils.debug-info --name debug-info --connect source-ctf-fs:muxer --connect muxer:debug-info --connect debug-info:pretty" -test_bt_convert_run_args 'path leftover + --debug-info-dir' "$path_to_trace --debug-info-dir=${output_path}" "--component source.ctf.fs --name source-ctf-fs --key path --value $path_to_trace --component sink.text.pretty --name pretty --component filter.utils.muxer --name muxer --component filter.lttng-utils.debug-info --name debug-info --key dir --value ${output_path} --connect source-ctf-fs:muxer --connect muxer:debug-info --connect debug-info:pretty" +test_bt_convert_run_args 'path leftover + --debug-info-dir' "$path_to_trace --debug-info-dir=${output_path}" "--component source.ctf.fs --name source-ctf-fs --key path --value $path_to_trace --component sink.text.pretty --name pretty --component filter.utils.muxer --name muxer --component filter.lttng-utils.debug-info --name debug-info --key debug-info-dir --value ${output_path} --connect source-ctf-fs:muxer --connect muxer:debug-info --connect debug-info:pretty" test_bt_convert_run_args 'path leftover + --debug-info-target-prefix' "$path_to_trace --debug-info-target-prefix=${output_path}" "--component source.ctf.fs --name source-ctf-fs --key path --value $path_to_trace --component sink.text.pretty --name pretty --component filter.utils.muxer --name muxer --component filter.lttng-utils.debug-info --name debug-info --key target-prefix --value ${output_path} --connect source-ctf-fs:muxer --connect muxer:debug-info --connect debug-info:pretty" test_bt_convert_run_args 'path leftover + --debug-info-full-path' "$path_to_trace --debug-info-full-path" "--component source.ctf.fs --name source-ctf-fs --key path --value $path_to_trace --component sink.text.pretty --name pretty --component filter.utils.muxer --name muxer --component filter.lttng-utils.debug-info --name debug-info --params full-path=yes --connect source-ctf-fs:muxer --connect muxer:debug-info --connect debug-info:pretty" test_bt_convert_run_args 'path leftover + --fields=trace:domain,loglevel' "--fields=trace:domain,loglevel $path_to_trace" "--component source.ctf.fs --name source-ctf-fs --key path --value $path_to_trace --component sink.text.pretty --name pretty --params field-trace:domain=yes,field-loglevel=yes,field-default=hide --component filter.utils.muxer --name muxer --connect source-ctf-fs:muxer --connect muxer:pretty" -- 2.34.1