From patchwork Sat Sep 9 03:16:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 137858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1502660vqo; Sun, 10 Sep 2023 02:25:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFM1aWsECzOJjX5jnrkvZndH9rOmllKtr0ElSBubKqG/cvd7T0fLj7zydV9elYTv+szagyY X-Received: by 2002:a05:6358:4320:b0:139:be3d:d047 with SMTP id r32-20020a056358432000b00139be3dd047mr7434824rwc.17.1694337928574; Sun, 10 Sep 2023 02:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694337928; cv=none; d=google.com; s=arc-20160816; b=rYOGU9x9ACsAHEuElEYCITrPe+v86x8gMEY13NhEwEmhXutn35QHpz47f411FCOWGo WOKFCNkUi4LYbpzwnEqsZqvM4RZFz6u2P+g3uhq3C2E+Wn1UaeXYB6UDi5lAoIBoAtCx EU5sxRD3YgL+968DNUGHgNclIQ84CO3ZeHfGDScb8qNcLIqY5W5iYUykdoFCXQItb4xV jKlLrZzvDtt2XEmY7UZIf9m6EYAF+kdIS1R7X0i/qRN0zvC9neH3KxICJrN9OeG+2AL6 1/LuzxBvjG1cme+3ucTdPDuYa/3Yh4PSmgJj18Yu5dNDvnf+2olSkovVEtKGR0Yf7B4x l0Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=u99/hgqxpKdzCD15l4YeNqBiui80L1j6u5zlzrvzFUo=; fh=XQnX/HXuQFr2jOP4K3MJlHD3mu7omgZCDXZUReVQ5ug=; b=JZKHSvwevaQJ1tdUmSuvxv9Cy/rTQYG1LTSdKCF7ad9BrMRRQEWcmuev1RkWLZOxDw imlzf2dppEQECe6xmAue76jaaS6aP2P5YNxsP9WgG4KeFILSqpbUJOMPxIcRlA1kSdVv 2+8aAvMEAQsbVEsJpPr6Nsp3WiRuX6p9yULjC2zMe7Io/+GECJzVIztn6RCURSC+1owc 00Xq27QY92QYHLWAgewylvD9ofGZX4Ai4zwYyOFZvh6BuCU10FHmaxGAa1E187xKSO3v qo2DEsB2CRTnb5VXD7z4kYMfh5sjBx+lqUjhvFh6T39H/byiK/zl54W/DKJphpZVJHH2 iRfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n6-20020a170903110600b001b878f9e11csi4728288plh.54.2023.09.10.02.25.24; Sun, 10 Sep 2023 02:25:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241966AbjIIDYU (ORCPT + 11 others); Fri, 8 Sep 2023 23:24:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234556AbjIIDXh (ORCPT ); Fri, 8 Sep 2023 23:23:37 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9ED51FF5; Fri, 8 Sep 2023 20:23:33 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5ABC5C433CD; Sat, 9 Sep 2023 03:23:32 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qeoZb-000YkY-0G; Fri, 08 Sep 2023 23:23:51 -0400 Message-ID: <20230909032350.900547495@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 08 Sep 2023 23:16:29 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , , Shuah Khan , Naveen N Rao Subject: [for-linus][PATCH 14/15] selftests/ftrace: Fix dependencies for some of the synthetic event tests References: <20230909031615.047488015@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776642087417700874 X-GMAIL-MSGID: 1776642087417700874 From: Naveen N Rao Commit b81a3a100cca1b ("tracing/histogram: Add simple tests for stacktrace usage of synthetic events") changed the output text in tracefs README, but missed updating some of the dependencies specified in selftests. This causes some of the tests to exit as unsupported. Fix this by changing the grep pattern. Since we want these tests to work on older kernels, match only against the common last part of the pattern. Link: https://lore.kernel.org/linux-trace-kernel/20230614091046.2178539-1-naveen@kernel.org Cc: Cc: Masami Hiramatsu Cc: Shuah Khan Fixes: b81a3a100cca ("tracing/histogram: Add simple tests for stacktrace usage of synthetic events") Signed-off-by: Naveen N Rao Signed-off-by: Steven Rostedt (Google) --- .../trigger/inter-event/trigger-synthetic-event-dynstring.tc | 2 +- .../inter-event/trigger-synthetic_event_syntax_errors.tc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc index 213d890ed188..174376ddbc6c 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test inter-event histogram trigger trace action with dynamic string param -# requires: set_event synthetic_events events/sched/sched_process_exec/hist "char name[]' >> synthetic_events":README ping:program +# requires: set_event synthetic_events events/sched/sched_process_exec/hist "' >> synthetic_events":README ping:program fail() { #msg echo $1 diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc index 955e3ceea44b..b927ee54c02d 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test synthetic_events syntax parser errors -# requires: synthetic_events error_log "char name[]' >> synthetic_events":README +# requires: synthetic_events error_log "' >> synthetic_events":README check_error() { # command-with-error-pos-by-^ ftrace_errlog_check 'synthetic_events' "$1" 'synthetic_events'