From patchwork Fri May 19 09:30:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Fancellu X-Patchwork-Id: 13247978 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7BBC0C77B7A for ; Fri, 19 May 2023 09:30:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.536849.835551 (Exim 4.92) (envelope-from ) id 1pzwRV-00038y-L9; Fri, 19 May 2023 09:30:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 536849.835551; Fri, 19 May 2023 09:30:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pzwRV-00038n-Gt; Fri, 19 May 2023 09:30:33 +0000 Received: by outflank-mailman (input) for mailman id 536849; Fri, 19 May 2023 09:30:32 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pzwRU-00038Z-ER for xen-devel@lists.xenproject.org; Fri, 19 May 2023 09:30:32 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id cc6e24ca-f627-11ed-b22d-6b7b168915f2; Fri, 19 May 2023 11:30:31 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AEEC62F4; Fri, 19 May 2023 02:31:15 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.arm.com [10.1.199.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9D3123F73F; Fri, 19 May 2023 02:30:29 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cc6e24ca-f627-11ed-b22d-6b7b168915f2 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 1/3] xen/misra: xen-analysis.py: Improve the cppcheck version check Date: Fri, 19 May 2023 10:30:17 +0100 Message-Id: <20230519093019.2131896-2-luca.fancellu@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230519093019.2131896-1-luca.fancellu@arm.com> References: <20230519093019.2131896-1-luca.fancellu@arm.com> MIME-Version: 1.0 Use tuple comparison to check the cppcheck version. Take the occasion to harden the regex, escaping the dots so that we check for them instead of generic characters. Suggested-by: Andrew Cooper Signed-off-by: Luca Fancellu Acked-by: Stefano Stabellini --- xen/scripts/xen_analysis/cppcheck_analysis.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/xen/scripts/xen_analysis/cppcheck_analysis.py b/xen/scripts/xen_analysis/cppcheck_analysis.py index c8abbe0fca79..8dc45e653b79 100644 --- a/xen/scripts/xen_analysis/cppcheck_analysis.py +++ b/xen/scripts/xen_analysis/cppcheck_analysis.py @@ -157,7 +157,7 @@ def generate_cppcheck_deps(): "Error occured retrieving cppcheck version:\n{}\n\n{}" ) - version_regex = re.search('^Cppcheck (\d+).(\d+)(?:.\d+)?$', + version_regex = re.search('^Cppcheck (\d+)\.(\d+)(?:\.\d+)?$', invoke_cppcheck, flags=re.M) # Currently, only cppcheck version >= 2.7 is supported, but version 2.8 is # known to be broken, please refer to docs/misra/cppcheck.txt @@ -166,15 +166,10 @@ def generate_cppcheck_deps(): "Can't find cppcheck version or version not identified: " "{}".format(invoke_cppcheck) ) - major = int(version_regex.group(1)) - minor = int(version_regex.group(2)) - if major < 2 or (major == 2 and minor < 7): + version = (int(version_regex.group(1)), int(version_regex.group(2))) + if version < (2, 7) or version == (2, 8): raise CppcheckDepsPhaseError( - "Cppcheck version < 2.7 is not supported" - ) - if major == 2 and minor == 8: - raise CppcheckDepsPhaseError( - "Cppcheck version 2.8 is known to be broken, see the documentation" + "Cppcheck version < 2.7 or 2.8 are not supported" ) # If misra option is selected, append misra addon and generate cppcheck