lkml.org 
[lkml]   [2015]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/13] perf tools: Add the bash completion for listing subsubcommands of perf test
    Date
    The bash completion does not support listing subsubcommands for 'perf
    test <TAB>', so fix it.

    Example:

    Before this patch:

    $ perf test <TAB>
    $

    As shown above, the subsubcommands of perf test does not come out.

    After this patch:

    $ perf test <TAB>
    list

    As shown above, the subsubcommands of perf test can come out now.

    Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
    ---
    tools/perf/perf-completion.sh | 2 +-
    tools/perf/tests/builtin-test.c | 5 +++--
    2 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
    index 8739a13..35f43fd 100644
    --- a/tools/perf/perf-completion.sh
    +++ b/tools/perf/perf-completion.sh
    @@ -143,7 +143,7 @@ __perf_main ()
    __perfcomp_colon "$evts" "$cur"
    else
    # List subcommands for perf commands
    - if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|data|help|script) ]]; then
    + if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|data|help|script|test) ]]; then
    subcmds=$($cmd $prev_skip_opts --list-cmds)
    __perfcomp_colon "$subcmds" "$cur"
    fi
    diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
    index 4b7d9ab..ed8e05c 100644
    --- a/tools/perf/tests/builtin-test.c
    +++ b/tools/perf/tests/builtin-test.c
    @@ -291,7 +291,7 @@ static int perf_test__list(int argc, const char **argv)

    int cmd_test(int argc, const char **argv, const char *prefix __maybe_unused)
    {
    - const char * const test_usage[] = {
    + const char *test_usage[] = {
    "perf test [<options>] [{list <test-name-fragment>|[<test-name-fragments>|<test-numbers>]}]",
    NULL,
    };
    @@ -302,13 +302,14 @@ int cmd_test(int argc, const char **argv, const char *prefix __maybe_unused)
    "be more verbose (show symbol address, etc)"),
    OPT_END()
    };
    + const char * const test_subcommands[] = { "list", NULL };
    struct intlist *skiplist = NULL;
    int ret = hists__init();

    if (ret < 0)
    return ret;

    - argc = parse_options(argc, argv, test_options, test_usage, 0);
    + argc = parse_options_subcommand(argc, argv, test_options, test_subcommands, test_usage, 0);
    if (argc >= 1 && !strcmp(argv[0], "list"))
    return perf_test__list(argc, argv);

    --
    1.8.5.2


    \
     
     \ /
      Last update: 2015-03-18 14:41    [W:3.965 / U:0.644 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site