From patchwork Thu Apr 22 16:57:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1469324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FR3W848cwz9sWK; Fri, 23 Apr 2021 02:57:23 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lZcdi-0003jg-13; Thu, 22 Apr 2021 16:57:18 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lZcde-0003jR-UP for kernel-team@lists.ubuntu.com; Thu, 22 Apr 2021 16:57:14 +0000 Received: from mail-ej1-f69.google.com ([209.85.218.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lZcde-00051H-Lr for kernel-team@lists.ubuntu.com; Thu, 22 Apr 2021 16:57:14 +0000 Received: by mail-ej1-f69.google.com with SMTP id r17-20020a1709069591b029037cf6a4a56dso7498261ejx.12 for ; Thu, 22 Apr 2021 09:57:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lmyvc1VhBFTC62ukga6/EGsd4VW8+T73KIuL0e8v2fE=; b=T1p3BwrL+oieUJ9Xq10urdUDq4CltsIffPY0ddlqD1vUTkurV4wZFXz5h9k18PuMzy MJeE3A6M9ZD8r8szfgon2jKGBhDc/Yu0RvRr2bHs0xLGnACYKoBSrKMvnKbl95BEg2OU ZUj049zncrzoEg8zHJmrKStg6MWx1yHfnbELiuWnGB++gGvlp7gzkkRf27JEM1gsk4Lz dTW2h+Hz2XtOB4k3Zm1Ikx2QF5C7JannuJ0DfwtxB0pbMCEvubiCQ9+tljpxrPZhpsw0 7Vxpo4MNX59M8j3/2uMylMUxxbHWCoESHtjnQN5kcjeShi7B60B5/exFXnpVoyfHEbVe meDw== X-Gm-Message-State: AOAM533SjUJKRIrIeIl8qA/VFF3oUsim1T1FfimqWkQ5OgSBH3aYi0c0 2VXrOeGLq+8L6VyfpEFwtgYSDscQFGGjd9vL1gMarqi5Av/1lB6oDW7vdFqjBYx7769vKO7JoYL rIrdJSjBzjQ9vLzozzwM0WA0+Li+nbbgbim/A3qUzaQ== X-Received: by 2002:a05:6402:1056:: with SMTP id e22mr5057832edu.279.1619110634383; Thu, 22 Apr 2021 09:57:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWYeVeBT6goMwumXHG/IT8vCLbzDa4USxqZ3FdVHgl8FxykhCJiFNHO5A2vsNcOMicOqLIKA== X-Received: by 2002:a05:6402:1056:: with SMTP id e22mr5057811edu.279.1619110634218; Thu, 22 Apr 2021 09:57:14 -0700 (PDT) Received: from xps-13-7390.homenet.telecomitalia.it (host-79-53-123-219.retail.telecomitalia.it. [79.53.123.219]) by smtp.gmail.com with ESMTPSA id l15sm2619114edb.48.2021.04.22.09.57.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 09:57:13 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][H] UBUNTU: SAUCE: Revert "selftests/ftrace: Update synthetic event syntax errors" Date: Thu, 22 Apr 2021 18:57:08 +0200 Message-Id: <20210422165709.414669-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210422165709.414669-1-andrea.righi@canonical.com> References: <20210422165709.414669-1-andrea.righi@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1925539 This reverts commit da5eb9adef3d67b195d84b15e91d30c56b454d7c. The ftrace synthetic event infrastructure has been reworked recently so also the corresponding selftest has been updated. However, in 5.11 we only got the update of the test case without the required commits for the reworked syntax in the kernel. For this reason the ftrace synthetic event test is failing. Revert the commit that introduced the change in the test case, reverting the previous behavior. Signed-off-by: Andrea Righi --- .../trigger-synthetic_event_syntax_errors.tc | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) 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..ada594fe16cb 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,38 +1,19 @@ #!/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 check_error() { # command-with-error-pos-by-^ ftrace_errlog_check 'synthetic_events' "$1" 'synthetic_events' } -check_dyn_error() { # command-with-error-pos-by-^ - ftrace_errlog_check 'synthetic_events' "$1" 'dynamic_events' -} - check_error 'myevent ^chr arg' # INVALID_TYPE -check_error 'myevent ^unsigned arg' # INCOMPLETE_TYPE - -check_error 'myevent char ^str]; int v' # BAD_NAME -check_error '^mye-vent char str[]' # BAD_NAME -check_error 'myevent char ^st-r[]' # BAD_NAME - -check_error 'myevent char str;^[]' # INVALID_FIELD -check_error 'myevent char str; ^int' # INVALID_FIELD - -check_error 'myevent char ^str[; int v' # INVALID_ARRAY_SPEC -check_error 'myevent char ^str[kdjdk]' # INVALID_ARRAY_SPEC -check_error 'myevent char ^str[257]' # INVALID_ARRAY_SPEC - -check_error '^mye;vent char str[]' # INVALID_CMD -check_error '^myevent ; char str[]' # INVALID_CMD -check_error '^myevent; char str[]' # INVALID_CMD -check_error '^myevent ;char str[]' # INVALID_CMD -check_error '^; char str[]' # INVALID_CMD -check_error '^;myevent char str[]' # INVALID_CMD -check_error '^myevent' # INVALID_CMD - -check_dyn_error '^s:junk/myevent char str[' # INVALID_DYN_CMD +check_error 'myevent ^char str[];; int v' # INVALID_TYPE +check_error 'myevent char ^str]; int v' # INVALID_NAME +check_error 'myevent char ^str;[]' # INVALID_NAME +check_error 'myevent ^char str[; int v' # INVALID_TYPE +check_error '^mye;vent char str[]' # BAD_NAME +check_error 'myevent char str[]; ^int' # INVALID_FIELD +check_error '^myevent' # INCOMPLETE_CMD exit 0