From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752546AbbCVKMT (ORCPT ); Sun, 22 Mar 2015 06:12:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57155 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751809AbbCVKMN (ORCPT ); Sun, 22 Mar 2015 06:12:13 -0400 Date: Sun, 22 Mar 2015 03:11:55 -0700 From: tip-bot for Yunlong Song Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, acme@redhat.com, a.p.zijlstra@chello.nl, mingo@kernel.org, yunlong.song@huawei.com, paulus@samba.org, wangnan0@huawei.com Reply-To: linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, acme@redhat.com, yunlong.song@huawei.com, mingo@kernel.org, wangnan0@huawei.com, paulus@samba.org, hpa@zytor.com In-Reply-To: <1426685758-25488-11-git-send-email-yunlong.song@huawei.com> References: <1426685758-25488-11-git-send-email-yunlong.song@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Add the bash completion for listing subsubcommands of perf test Git-Commit-ID: 1f9975f14ce4f7258db1cb0eea8fba17482e331e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1f9975f14ce4f7258db1cb0eea8fba17482e331e Gitweb: http://git.kernel.org/tip/1f9975f14ce4f7258db1cb0eea8fba17482e331e Author: Yunlong Song AuthorDate: Wed, 18 Mar 2015 21:35:55 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 19 Mar 2015 13:52:54 -0300 perf tools: Add the bash completion for listing subsubcommands of perf test The bash completion does not support listing subsubcommands for 'perf test ', so fix it. Example: Before this patch: $ perf test $ As shown above, the subsubcommands of perf test does not come out. After this patch: $ perf test list As shown above, the subsubcommands of perf test can come out now. Signed-off-by: Yunlong Song Tested-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1426685758-25488-11-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- 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 [] [{list |[|]}]", 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);