From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752881AbcEWTPo (ORCPT ); Mon, 23 May 2016 15:15:44 -0400 Received: from smtprelay0011.hostedemail.com ([216.40.44.11]:49772 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751890AbcEWTPm (ORCPT ); Mon, 23 May 2016 15:15:42 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::,RULES_HIT:41:355:379:541:800:960:973:982:988:989:1260:1277:1311:1313:1314:1345:1437:1515:1516:1518:1534:1543:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2693:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3870:3871:3872:3874:4321:4605:5007:6261:10004:10400:10848:11026:11657:11658:11914:12043:12296:12517:12519:12555:13161:13229:13439:14093:14097:14181:14659:14721:21080:21088:21324:21434:30012:30054:30056,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: bone89_88cd4c49fa54b X-Filterd-Recvd-Size: 3910 Date: Mon, 23 May 2016 15:15:38 -0400 From: Steven Rostedt To: LKML Cc: Masami Hiramatsu , Namhyung Kim , Shuah Khan , linux-kselftest@vger.kernel.org Subject: [RFC][PATCH] ftracetest: Fix hist unsupported result in hist selftests Message-ID: <20160523151538.4ea9ce0c@gandalf.local.home> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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. 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