From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933065AbbLHEdw (ORCPT ); Mon, 7 Dec 2015 23:33:52 -0500 Received: from terminus.zytor.com ([198.137.202.10]:50768 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932692AbbLHEdt (ORCPT ); Mon, 7 Dec 2015 23:33:49 -0500 Date: Mon, 7 Dec 2015 20:32:21 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: wangnan0@huawei.com, dsahern@gmail.com, mingo@kernel.org, namhyung@kernel.org, tglx@linutronix.de, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com, acme@redhat.com, a.p.zijlstra@chello.nl, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, jolsa@kernel.org Reply-To: linux-kernel@vger.kernel.org, adrian.hunter@intel.com, jolsa@kernel.org, masami.hiramatsu.pt@hitachi.com, acme@redhat.com, a.p.zijlstra@chello.nl, namhyung@kernel.org, tglx@linutronix.de, hpa@zytor.com, wangnan0@huawei.com, dsahern@gmail.com, mingo@kernel.org In-Reply-To: <1449131658-1841-6-git-send-email-jolsa@kernel.org> References: <1449131658-1841-6-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test: Prevent using bpf-output event in round trip name test Git-Commit-ID: c0651c41e45dee1d6abb83fd5b25e7097aeac141 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: c0651c41e45dee1d6abb83fd5b25e7097aeac141 Gitweb: http://git.kernel.org/tip/c0651c41e45dee1d6abb83fd5b25e7097aeac141 Author: Jiri Olsa AuthorDate: Thu, 3 Dec 2015 09:34:16 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 7 Dec 2015 18:12:56 -0300 perf test: Prevent using bpf-output event in round trip name test The bpf-output is added under software events, but is not parse-able within parse_events, which is what round trip test is expecting. Checking software events only until dummy event. Signed-off-by: Jiri Olsa Acked-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Cc: Adrian Hunter Cc: David Ahern Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1449131658-1841-6-git-send-email-jolsa@kernel.org [ Make it a one liner by keeping __perf_evsel__name_array_test() around ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/evsel-roundtrip-name.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/evsel-roundtrip-name.c b/tools/perf/tests/evsel-roundtrip-name.c index 1da92e1..2de4a4f 100644 --- a/tools/perf/tests/evsel-roundtrip-name.c +++ b/tools/perf/tests/evsel-roundtrip-name.c @@ -103,7 +103,8 @@ int test__perf_evsel__roundtrip_name_test(int subtest __maybe_unused) if (err) ret = err; - err = perf_evsel__name_array_test(perf_evsel__sw_names); + err = __perf_evsel__name_array_test(perf_evsel__sw_names, + PERF_COUNT_SW_DUMMY + 1); if (err) ret = err;