On Thu, Jun 01, 2017 at 03:10:07PM +0200, Jiri Olsa wrote: > On Thu, Jun 01, 2017 at 10:04:58AM -0300, Arnaldo Carvalho de Melo wrote: > > Em Tue, May 16, 2017 at 07:49:42PM +0200, Jiri Olsa escreveu: > > > Following tests are constantly failing on powerpc: > > > > > > # perf test break > > > 18: Breakpoint overflow signal handler : FAILED! > > > 19: Breakpoint overflow sampling : FAILED! > > > > > > The powerpc so far does not have support to even create > > > instruction breakpoint using the perf event interface, > > > so those tests fail early in the config phase. > > > > > > I added 'ison' callback to test struct to be able to > > > disable specific test. It seems better than putting > > > ifdefs directly to the test array. > > > > > > Link: http://lkml.kernel.org/n/tip-erwshbq6f7b7hdtu65z5a...@git.kernel.org > > > Signed-off-by: Jiri Olsa <jo...@kernel.org> > > > --- > > > tools/perf/tests/bp_signal.c | 14 ++++++++++++++ > > > tools/perf/tests/builtin-test.c | 7 +++++++ > > > tools/perf/tests/tests.h | 3 +++ > > > 3 files changed, 24 insertions(+) > > > > > > diff --git a/tools/perf/tests/bp_signal.c b/tools/perf/tests/bp_signal.c > > > index e7664fe3bd33..0467c3b6d849 100644 > > > --- a/tools/perf/tests/bp_signal.c > > > +++ b/tools/perf/tests/bp_signal.c > > > @@ -288,3 +288,17 @@ int test__bp_signal(int subtest __maybe_unused) > > > return count1 == 1 && overflows == 3 && count2 == 3 && overflows_2 == 3 > > > && count3 == 2 ? > > > TEST_OK : TEST_FAIL; > > > } > > > + > > > +bool test__bp_signal_is_on(void) > > > > Can you please rename this "_is_on()" thing to "_supported()"?
v2 attached, jirka --- Following tests are constantly failing on powerpc: # perf test break 18: Breakpoint overflow signal handler : FAILED! 19: Breakpoint overflow sampling : FAILED! The powerpc so far does not have support to even create instruction breakpoint using the perf event interface, so those tests fail early in the config phase. I added 'is_supported' callback to test struct to be able to disable specific test. It seems better than putting ifdefs directly to the test array. Link: http://lkml.kernel.org/n/tip-erwshbq6f7b7hdtu65z5a...@git.kernel.org Signed-off-by: Jiri Olsa <jo...@kernel.org> --- tools/perf/tests/bp_signal.c | 14 ++++++++++++++ tools/perf/tests/builtin-test.c | 7 +++++++ tools/perf/tests/tests.h | 3 +++ 3 files changed, 24 insertions(+) diff --git a/tools/perf/tests/bp_signal.c b/tools/perf/tests/bp_signal.c index e7664fe3bd33..8ba2c4618fe9 100644 --- a/tools/perf/tests/bp_signal.c +++ b/tools/perf/tests/bp_signal.c @@ -288,3 +288,17 @@ int test__bp_signal(int subtest __maybe_unused) return count1 == 1 && overflows == 3 && count2 == 3 && overflows_2 == 3 && count3 == 2 ? TEST_OK : TEST_FAIL; } + +bool test__bp_signal_is_supported(void) +{ +/* + * The powerpc so far does not have support to even create + * instruction breakpoint using the perf event interface. + * Once it's there we can release this. + */ +#ifdef __powerpc__ + return false; +#else + return true; +#endif +} diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 9e08d297f1a9..3ccfd58a8c3c 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -97,10 +97,12 @@ static struct test generic_tests[] = { { .desc = "Breakpoint overflow signal handler", .func = test__bp_signal, + .is_supported = test__bp_signal_is_supported, }, { .desc = "Breakpoint overflow sampling", .func = test__bp_signal_overflow, + .is_supported = test__bp_signal_is_supported, }, { .desc = "Number of exit events of a simple workload", @@ -401,6 +403,11 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) if (!perf_test__matches(t, curr, argc, argv)) continue; + if (t->is_supported && !t->is_supported()) { + pr_debug("%2d: %-*s: Disabled\n", i, width, t->desc); + continue; + } + pr_info("%2d: %-*s:", i, width, t->desc); if (intlist__find(skiplist, i)) { diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index 631859629403..577363809c9b 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -34,6 +34,7 @@ struct test { int (*get_nr)(void); const char *(*get_desc)(int subtest); } subtest; + bool (*is_supported)(void); }; /* Tests */ @@ -99,6 +100,8 @@ const char *test__clang_subtest_get_desc(int subtest); int test__clang_subtest_get_nr(void); int test__unit_number__scnprint(int subtest); +bool test__bp_signal_is_supported(void); + #if defined(__arm__) || defined(__aarch64__) #ifdef HAVE_DWARF_UNWIND_SUPPORT struct thread; -- 2.9.4
