From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759255AbbLCIfw (ORCPT ); Thu, 3 Dec 2015 03:35:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44981 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932090AbbLCIef (ORCPT ); Thu, 3 Dec 2015 03:34:35 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra , =?UTF-8?q?HIRAMATU=EF=BC=8CMASAMI?= , Wang Nan , Adrian Hunter Subject: [PATCH 5/7] perf test: Prevent using bpf-output event in round trip name test Date: Thu, 3 Dec 2015 09:34:16 +0100 Message-Id: <1449131658-1841-6-git-send-email-jolsa@kernel.org> In-Reply-To: <1449131658-1841-1-git-send-email-jolsa@kernel.org> References: <1449131658-1841-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Link: http://lkml.kernel.org/n/tip-oyz0zo99of6gd9axi5f99szm@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/tests/evsel-roundtrip-name.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/perf/tests/evsel-roundtrip-name.c b/tools/perf/tests/evsel-roundtrip-name.c index 1da92e1159ee..97f3b7268a85 100644 --- a/tools/perf/tests/evsel-roundtrip-name.c +++ b/tools/perf/tests/evsel-roundtrip-name.c @@ -61,7 +61,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) return ret; } -static int __perf_evsel__name_array_test(const char *names[], int nr_names) +static int perf_evsel__name_array_test(const char *names[], int nr_names) { int i, err; struct perf_evsel *evsel; @@ -92,18 +92,17 @@ out_delete_evlist: return err; } -#define perf_evsel__name_array_test(names) \ - __perf_evsel__name_array_test(names, ARRAY_SIZE(names)) - int test__perf_evsel__roundtrip_name_test(int subtest __maybe_unused) { int err = 0, ret = 0; - err = perf_evsel__name_array_test(perf_evsel__hw_names); + err = perf_evsel__name_array_test(perf_evsel__hw_names, + ARRAY_SIZE(perf_evsel__hw_names)); 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; -- 2.4.3