From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AF58C4724C for ; Sat, 2 May 2020 03:08:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB81320857 for ; Sat, 2 May 2020 03:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588388928; bh=CVVzZMedAe8PdBduhRusdDDg5TkLXYOBqIOrAi/OAWY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=jb593SAfviOajGZJYsuEzfFK+0FopeqK9I78VdisW9P8Swf/vm2RxYlDR3LrLazps fsKQTZN3/pRRK31fQNoCnvt1BAZfaC5RSJ8wQJelprpK9zfIarza6yGD6+JWeW6p5e sHn11iKSEN3weTQipZOmrpt6638A9dt3AyMb/J9U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727030AbgEBDIr (ORCPT ); Fri, 1 May 2020 23:08:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:33206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726439AbgEBDIq (ORCPT ); Fri, 1 May 2020 23:08:46 -0400 Received: from devnote2 (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7CDEC20643; Sat, 2 May 2020 03:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588388926; bh=CVVzZMedAe8PdBduhRusdDDg5TkLXYOBqIOrAi/OAWY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=EBHU+MfU3W/1OIbC5IeO5DS/aUfTleTjzlVdYqwiU2A56qhLp6gxrAHjEi1GqCe1D g1+ws0Yh3rJdba9K4bcy/y56KZ6ExbsYS5IAWcAJL5hjQ2hI5QVjbUZfFjPgkugdwk zYtonEgOJaXs5NfBCM/M3Y8BPd/Iw0qbIe7Tdy/o= Date: Sat, 2 May 2020 12:08:42 +0900 From: Masami Hiramatsu To: Steven Rostedt Cc: Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Zanussi , Li Philip , Liu Yiding Subject: Re: [PATCH 3/3] selftests/ftrace: Use /bin/echo instead of built-in echo Message-Id: <20200502120842.9d93352083fb854295150235@kernel.org> In-Reply-To: <20200501101942.5c0da986@gandalf.local.home> References: <158834025077.28357.15141584656220094821.stgit@devnote2> <158834028054.28357.398159034694277189.stgit@devnote2> <20200501101942.5c0da986@gandalf.local.home> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 1 May 2020 10:19:42 -0400 Steven Rostedt wrote: > On Fri, 1 May 2020 22:38:00 +0900 > Masami Hiramatsu wrote: > > > Since the built-in echo has different behavior in POSIX shell > > (dash) and bash, we forcibly use /bin/echo -E (not interpret > > backslash escapes) by default. > > > > This also fixes some test cases which expects built-in > > echo command. > > > > Reported-by: Liu Yiding > > Signed-off-by: Masami Hiramatsu > > --- > > tools/testing/selftests/ftrace/test.d/functions | 3 +++ > > .../test.d/trigger/trigger-trace-marker-hist.tc | 2 +- > > .../trigger-trace-marker-synthetic-kernel.tc | 4 ++++ > > .../trigger/trigger-trace-marker-synthetic.tc | 4 ++-- > > 4 files changed, 10 insertions(+), 3 deletions(-) > > > > diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions > > index 5d4550591ff9..ea59b6ea2c3e 100644 > > --- a/tools/testing/selftests/ftrace/test.d/functions > > +++ b/tools/testing/selftests/ftrace/test.d/functions > > @@ -1,3 +1,6 @@ > > +# Since the built-in echo has different behavior in POSIX shell (dash) and > > +# bash, we forcibly use /bin/echo -E (not interpret backslash escapes). > > +alias echo="/bin/echo -E" > > > > clear_trace() { # reset trace output > > echo > trace > > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc > > index ab6bedb25736..b3f70f53ee69 100644 > > --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc > > +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc > > @@ -30,7 +30,7 @@ fi > > > > echo "Test histogram trace_marker tigger" > > > > -echo 'hist:keys=common_pid' > events/ftrace/print/trigger > > +echo 'hist:keys=ip' > events/ftrace/print/trigger > > This is doing more than just changing the echo being used. It's changing > the test being done. Yes, I need Tom's review for this change. As far as I can test, this fixes the test failure. If this isn't acceptable, we can use "alias echo=echo" for this test case. Thank you, > > > for i in `seq 1 10` ; do echo "hello" > trace_marker; done > > grep 'hitcount: *10$' events/ftrace/print/hist > /dev/null || \ > > fail "hist trigger did not trigger correct times on trace_marker" > > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic-kernel.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic-kernel.tc > > index 18b4d1c2807e..c1625d945f4d 100644 > > --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic-kernel.tc > > +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic-kernel.tc > > @@ -44,6 +44,10 @@ echo 'latency u64 lat' > synthetic_events > > echo 'hist:keys=pid:ts0=common_timestamp.usecs' > events/sched/sched_waking/trigger > > echo 'hist:keys=common_pid:lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_waking).latency($lat)' > events/ftrace/print/trigger > > echo 'hist:keys=common_pid,lat:sort=lat' > events/synthetic/latency/trigger > > + > > +# We have to use the built-in echo here because waking up pid must be same > > +# as echoing pid. > > +alias echo=echo > > sleep 1 > > echo "hello" > trace_marker > > > > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic.tc > > index dd262d6d0db6..23e52c8d71de 100644 > > --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic.tc > > +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic.tc > > @@ -36,8 +36,8 @@ fi > > echo "Test histogram trace_marker to trace_marker latency histogram trigger" > > > > echo 'latency u64 lat' > synthetic_events > > -echo 'hist:keys=common_pid:ts0=common_timestamp.usecs if buf == "start"' > events/ftrace/print/trigger > > -echo 'hist:keys=common_pid:lat=common_timestamp.usecs-$ts0:onmatch(ftrace.print).latency($lat) if buf == "end"' >> events/ftrace/print/trigger > > +echo 'hist:keys=ip:ts0=common_timestamp.usecs if buf == "start"' > events/ftrace/print/trigger > > +echo 'hist:keys=ip:lat=common_timestamp.usecs-$ts0:onmatch(ftrace.print).latency($lat) if buf == "end"' >> events/ftrace/print/trigger > > This too. And it's not explained in the change log why. In fact, these > changes look like they belong in a separate patch. > > -- Steve > > > echo 'hist:keys=common_pid,lat:sort=lat' > events/synthetic/latency/trigger > > echo -n "start" > trace_marker > > echo -n "end" > trace_marker > -- Masami Hiramatsu