From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751874AbcFTA1n (ORCPT ); Sun, 19 Jun 2016 20:27:43 -0400 Received: from LGEAMRELO13.lge.com ([156.147.23.53]:58222 "EHLO lgeamrelo13.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751357AbcFTA1l (ORCPT ); Sun, 19 Jun 2016 20:27:41 -0400 X-Original-SENDERIP: 156.147.1.125 X-Original-MAILFROM: namhyung@kernel.org X-Original-SENDERIP: 165.244.98.203 X-Original-MAILFROM: namhyung@kernel.org X-Original-SENDERIP: 10.177.227.17 X-Original-MAILFROM: namhyung@kernel.org Date: Mon, 20 Jun 2016 08:42:36 +0900 From: Namhyung Kim To: Steven Rostedt CC: LKML , Masami Hiramatsu , Shuah Khan , Subject: Re: [RFC][PATCH] ftracetest: Fix hist unsupported result in hist selftests Message-ID: <20160619234236.GA25962@sejong> References: <20160523151538.4ea9ce0c@gandalf.local.home> <20160523235438.GA1636@sejong> <20160523215045.583d0fc1@gandalf.local.home> <20160524021630.GA5062@sejong> <20160523223243.1aaab4de@grimm.local.home> <20160524030235.GA5856@sejong> <20160617172847.5b2ebc23@gandalf.local.home> MIME-Version: 1.0 In-Reply-To: <20160617172847.5b2ebc23@gandalf.local.home> User-Agent: Mutt/1.6.1 (2016-04-27) X-MIMETrack: Itemize by SMTP Server on LGEKRMHUB08/LGE/LG Group(Release 8.5.3FP6|November 21, 2013) at 2016/06/20 08:42:36, Serialize by Router on LGEKRMHUB08/LGE/LG Group(Release 8.5.3FP6|November 21, 2013) at 2016/06/20 08:42:36, Serialize complete at 2016/06/20 08:42:36 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 On Fri, Jun 17, 2016 at 05:28:47PM -0400, Steven Rostedt wrote: > Ah, due to traveling I never got around to finishing this. What about > this patch? > > From 7bf19b58ba02e66014efce6c051acba2c6cbd861 Mon Sep 17 00:00:00 2001 > From: "Steven Rostedt (Red Hat)" > Date: Mon, 23 May 2016 15:06:30 -0400 > Subject: [PATCH] ftracetest: Fix hist unsupported result in hist selftests > > When histograms are not configured in the kernel, the ftracetest histogram > selftests should return "unsupported" and not "Failed". To detect this, the > test scripts have: > > FEATURE=`grep hist events/sched/sched_process_fork/trigger` > if [ -z "$FEATURE" ]; then > echo "hist trigger is not supported" > exit_unsupported > fi > > The problem is that '-e' is in effect and any error will cause the program > to terminate. The grep for 'hist' fails, because it is not compiled it (thus > unsupported), but because grep has an error code for failing to find the > string, it causes the program to terminate, and is marked as a failed test. > > Namhyung Kim recommended to test for the "hist" file located in > events/sched/sched_process_fork/hist instead, as it is more inline with the > other checks. As the hist file is only created if the histogram feature is > enabled, that is a valid check. > > Link: http://lkml.kernel.org/r/20160523151538.4ea9ce0c@gandalf.local.home > > Suggested-by: Namhyung Kim > Fixes: 76929ab51f0ee ("kselftests/ftrace: Add hist trigger testcases") > Signed-off-by: Steven Rostedt Acked-by: Namhyung Kim Thanks, Namhyung > --- > .../testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc | 9 ++++----- > tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc | 9 ++++----- > .../testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc | 9 ++++----- > 3 files changed, 12 insertions(+), 15 deletions(-) > > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc > index c2b61c4fda11..0bf5085281f3 100644 > --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc > +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc > @@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then > exit_unsupported > fi > > -reset_tracer > -do_reset > - > -FEATURE=`grep hist events/sched/sched_process_fork/trigger` > -if [ -z "$FEATURE" ]; then > +if [ ! -f events/sched/sched_process_fork/hist ]; then > echo "hist trigger is not supported" > exit_unsupported > fi > > +reset_tracer > +do_reset > + > echo "Test histogram with execname modifier" > > echo 'hist:keys=common_pid.execname' > events/sched/sched_process_fork/trigger > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc > index b2902d42a537..a00184cd9c95 100644 > --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc > +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc > @@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then > exit_unsupported > fi > > -reset_tracer > -do_reset > - > -FEATURE=`grep hist events/sched/sched_process_fork/trigger` > -if [ -z "$FEATURE" ]; then > +if [ ! -f events/sched/sched_process_fork/hist ]; then > echo "hist trigger is not supported" > exit_unsupported > fi > > +reset_tracer > +do_reset > + > echo "Test histogram basic tigger" > > echo 'hist:keys=parent_pid:vals=child_pid' > events/sched/sched_process_fork/trigger > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc > index 03c4a46561fc..3478b00ead57 100644 > --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc > +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc > @@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then > exit_unsupported > fi > > -reset_tracer > -do_reset > - > -FEATURE=`grep hist events/sched/sched_process_fork/trigger` > -if [ -z "$FEATURE" ]; then > +if [ ! -f events/sched/sched_process_fork/hist ]; then > echo "hist trigger is not supported" > exit_unsupported > fi > > +reset_tracer > +do_reset > + > reset_trigger > > echo "Test histogram multiple tiggers" > -- > 1.9.3 >