tests/lib: remove `test_bt_values` and `test_graph_topo`

[babeltrace.git] / src / cli / babeltrace2-cfg-cli-args.c

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index 6e9aac954c534ef380200a441c2e293da21ba4cf..ce1762876afa6bee43a176556e3e44ab3babf6e1 100644 (file)
--- a/src/cli/babeltrace2-cfg-cli-args.c
+++ b/src/cli/babeltrace2-cfg-cli-args.c
@@ -2868,6 +2868,7 @@ void print_convert_usage(FILE *fp)
        fprintf(fp, "  -P, --path=PATH                   Set the `path` string parameter of the\n");
        fprintf(fp, "                                    current component to PATH\n");
        fprintf(fp, "      --plugin-path=PATH[:PATH]...  Add PATH to the list of paths from which\n");
+       fprintf(fp, "                                    dynamic plugins can be loaded\n");
        fprintf(fp, "      --retry-duration=DUR          When babeltrace2(1) needs to retry to run\n");
        fprintf(fp, "                                    the graph later, retry in DUR µs\n");
        fprintf(fp, "                                    (default: 100000)\n");
@@ -4421,13 +4422,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        stream_intersection_mode = true;
                        break;
                case OPT_VERBOSE:
-                       if (*default_log_level != BT_LOG_VERBOSE &&
+                       if (*default_log_level != BT_LOG_TRACE &&
                                        *default_log_level != BT_LOG_DEBUG) {
                                *default_log_level = BT_LOG_INFO;
                        }
                        break;
                case OPT_DEBUG:
-                       *default_log_level = BT_LOG_VERBOSE;
+                       *default_log_level = BT_LOG_TRACE;
                        break;
                default:
                        break;
@@ -4878,6 +4879,14 @@ error:
        BT_OBJECT_PUT_REF_AND_RESET(cfg);
 
 end:
+       /*
+        * If the log level is still unset at this point, set it to
+        * the program's default.
+        */
+       if (*default_log_level < 0) {
+               *default_log_level = cli_default_log_level;
+       }
+
        if (pc) {
                poptFreeContext(pc);
        }
@@ -4986,17 +4995,17 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
 
                if (strcmp(cur_arg, "-d") == 0 ||
                                strcmp(cur_arg, "--debug") == 0) {
-                       default_log_level = BT_LOG_VERBOSE;
+                       default_log_level = BT_LOG_TRACE;
                } else if (strcmp(cur_arg, "-v") == 0 ||
                                strcmp(cur_arg, "--verbose") == 0) {
-                       if (default_log_level != BT_LOG_VERBOSE &&
+                       if (default_log_level != BT_LOG_TRACE &&
                                        default_log_level != BT_LOG_DEBUG) {
                                /*
                                 * Legacy: do not override a previous
                                 * --debug because --verbose and --debug
                                 * can be specified together (in this
                                 * case we want the lowest log level to
-                                * apply, VERBOSE).
+                                * apply, TRACE).
                                 */
                                default_log_level = BT_LOG_INFO;
                        }
@@ -5138,7 +5147,7 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
        }
 
        if (config) {
-               BT_ASSERT(default_log_level >= BT_LOG_VERBOSE);
+               BT_ASSERT(default_log_level >= BT_LOG_TRACE);
                config->log_level = default_log_level;
                config->command_name = command_name;
        }