From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752235AbcEWXyq (ORCPT ); Mon, 23 May 2016 19:54:46 -0400 Received: from LGEAMRELO12.lge.com ([156.147.23.52]:47853 "EHLO lgeamrelo12.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752077AbcEWXyn (ORCPT ); Mon, 23 May 2016 19:54:43 -0400 X-Original-SENDERIP: 156.147.1.127 X-Original-MAILFROM: namhyung@kernel.org X-Original-SENDERIP: 165.244.98.76 X-Original-MAILFROM: namhyung@kernel.org X-Original-SENDERIP: 10.177.227.17 X-Original-MAILFROM: namhyung@kernel.org Date: Tue, 24 May 2016 08:54:38 +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: <20160523235438.GA1636@sejong> References: <20160523151538.4ea9ce0c@gandalf.local.home> MIME-Version: 1.0 In-Reply-To: <20160523151538.4ea9ce0c@gandalf.local.home> User-Agent: Mutt/1.6.1 (2016-04-27) X-MIMETrack: Itemize by SMTP Server on LGEKRMHUB03/LGE/LG Group(Release 8.5.3FP6|November 21, 2013) at 2016/05/24 08:54:38, Serialize by Router on LGEKRMHUB03/LGE/LG Group(Release 8.5.3FP6|November 21, 2013) at 2016/05/24 08:54:38, Serialize complete at 2016/05/24 08:54:38 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 Hi Steve, On Mon, May 23, 2016 at 03:15:38PM -0400, Steven Rostedt wrote: > > [ Folks, is this a proper work around? ] > > 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. We have a feature check before doing grep, doesn't it detect such case? if [ ! -f events/sched/sched_process_fork/trigger ]; then echo "event trigger is not supported" exit_unsupported fi Thanks, Namhyung > > As a work around, I added "|| echo -n ''" to not let bash terminate the > script on a failed grep, and then the rest of the script can handle the fact > that histograms are not supported and return a proper result. > > Signed-off-by: Steven Rostedt > --- > tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc | 2 +- > tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc | 2 +- > tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc | 2 +- > 3 files changed, 3 insertions(+), 3 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..6c100759c758 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 > @@ -26,7 +26,7 @@ fi > reset_tracer > do_reset > > -FEATURE=`grep hist events/sched/sched_process_fork/trigger` > +FEATURE=`grep hist events/sched/sched_process_fork/trigger || echo -n ''` > if [ -z "$FEATURE" ]; then > echo "hist trigger is not supported" > exit_unsupported > 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..8d691dc0c5cc 100644 > --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc > +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc > @@ -26,7 +26,7 @@ fi > reset_tracer > do_reset > > -FEATURE=`grep hist events/sched/sched_process_fork/trigger` > +FEATURE=`grep hist events/sched/sched_process_fork/trigger || echo -n ''` > if [ -z "$FEATURE" ]; then > echo "hist trigger is not supported" > exit_unsupported > 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..1a11e641e97d 100644 > --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc > +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc > @@ -26,7 +26,7 @@ fi > reset_tracer > do_reset > > -FEATURE=`grep hist events/sched/sched_process_fork/trigger` > +FEATURE=`grep hist events/sched/sched_process_fork/trigger || echo -n ''` > if [ -z "$FEATURE" ]; then > echo "hist trigger is not supported" > exit_unsupported > -- > 1.8.3.1 >