From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.3613.1615775279264068515 for ; Sun, 14 Mar 2021 19:28:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=wbakUnP1; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: bob.c.feng@intel.com) IronPort-SDR: CyVxGrehrplOS0nfoTeu8Viz5Mv7vTMYo0PgAv94nqOjgDNLQkxbGr3E9Bq9F+asIJlms1vqxy LyJl0ylIx+NQ== X-IronPort-AV: E=McAfee;i="6000,8403,9923"; a="188387070" X-IronPort-AV: E=Sophos;i="5.81,249,1610438400"; d="scan'208";a="188387070" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2021 19:27:58 -0700 IronPort-SDR: h+4htiSLn89awipw+awDZgOuZuj49jFc+Z0KhHB2tLJ14CCPbtF74+yBsHxZRAhmTMwb8hLHiX Vol7J5anmLqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,249,1610438400"; d="scan'208";a="378359197" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga007.fm.intel.com with ESMTP; 14 Mar 2021 19:27:58 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Sun, 14 Mar 2021 19:27:58 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Sun, 14 Mar 2021 19:27:57 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Sun, 14 Mar 2021 19:27:57 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.100) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Sun, 14 Mar 2021 19:27:57 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J+vN0vmqCCUDmwI3XTAA8SyMO2dMTDSkJiwtXlTsvH12+yIO4waOr8U4NBkMnFUFTrgK26s4kL681NyLCWZ3PxL+kMBJAzogx7eE6EySudDirFSlnOo0pFCXa8vEFSisOViXDhQbIv6pUbQ+j0+DSXReOU7FMEOcqU7BmWwMHGer5L5pJJCmnh7rt/+7OYsuVJm6TzWJ9hjVUpXHYz9//ueyViaShVWJc1qmWtJ5LIJWeQx/Fi2FEZ1TSWTVYqliG/3zZKw0b4V1USS5zAoegvDAq/25OvunL+lmD4J5wX41h5UIc54PNvPwxtdQUY4Hh0yAKYGZRWZfMshoqhFzRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4SD1Qoq3DB31o5AdKp9LEMtfieRSD+voY23lujWTiW4=; b=lg/iKu/FlIH+kTk+7aAYtQe1OCbUfLoLF/SuNseWdNdFKKP+L6Nt5V/KPhCVA5jh1Qcj2LNdvNH7e9EJocBnofPBAtuEc2pLNvHgljPt/Tju8uC1eYLn4BKpnbzR5xqQauKEV2Qq5sy3y5al4h5HF98bor2CVdI9f9YdGPrjSLzzB7kTB/h1za9A/2Z9cOPe0Fsb02bn7K9y1vN+S1+YlMoRXB0ZyPg/3D6SLhI+bC+c6SV2b1fES3sTuqXnX1p3RwTkfSuDfU4MWJOQnIMMMhRnUXR94PLe31Ry4rwfphQm25dhNpL/OxjX8pCSWrBma57kXES3T8Om/JjtZ3chkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4SD1Qoq3DB31o5AdKp9LEMtfieRSD+voY23lujWTiW4=; b=wbakUnP1PeHGHQ94UgO7AV5C71TAy39V+9haHahV/8Wg1xm2XN2ZSTy+ZnFp2jLNlb59294u9WRh+B2Xun773JaQ6H7oVi611TgGEALOx/XD0dTNjPo+Y1kPKDAaU71AJb/Rb0+D5Ba7lTZD807ysAkK0lK9z9APZZxEyPcYUWA= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM4PR11MB5278.namprd11.prod.outlook.com (2603:10b6:5:389::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Mon, 15 Mar 2021 02:27:56 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::10db:5760:d7f5:d0e0]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::10db:5760:d7f5:d0e0%3]) with mapi id 15.20.3933.032; Mon, 15 Mar 2021 02:27:56 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "pierre.gondois@arm.com" , "gaoliming@byosoft.com.cn" , "Chen, Christine" Subject: Re: [edk2-devel] [PATCH v1 1/1] BaseTools/Ecc: Make Ecc only check first include guard Thread-Topic: [edk2-devel] [PATCH v1 1/1] BaseTools/Ecc: Make Ecc only check first include guard Thread-Index: AQHXFP+8qL6jCscsrkWzwOIfe3JXqaqEWw1g Date: Mon, 15 Mar 2021 02:27:56 +0000 Message-ID: References: <20210309161728.13820-1-Pierre.Gondois@arm.com> In-Reply-To: <20210309161728.13820-1-Pierre.Gondois@arm.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.54] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 67d8754f-461f-4f53-c474-08d8e759f1b4 x-ms-traffictypediagnostic: DM4PR11MB5278: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:451; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vwAmf8qb6XNSmKVpIwDcJurnQUBNCG04SjUA5Qd13ktGXbMwG34H4Xsve8UTkS+BSdfKYFBsf8z2RIVK15JbT2GqRlL4ez3E3ZzpkDotL+OFE9OlzwhBhXOOfL5DciiVskcGyCqfgOzWbDh6BfEYgQXvd1uyibk+vrARaXJYcrsm/H5kUmHC1miCMXjZTi35aOq70HqE0SJOgCUQ+6KtloqYg5s+JI6Xj8td9HpbIAQQq4GnI904b5M28Gpd57PtT3/INjApn+8vaAmUviePfvTQ18D1iCLF1dJMV7uPJr56LiItIAhS2vAZLWsO4A9r4xJBoOF1frIKSfpxA7Z8WT6zSf5QAOzG3VUXoYnAcPyT/mi+8Kzdo9GDZi3rnbTP6r2ekrZYE5SBB2XgyrQjjU0s8mnZluudX6jrvSTS3nEU0zorrTuM59S3UTSvxdLPOD3+IOUA2tkUiky/fkSimsxlYDKcQ8CCNtc4mAwIl5P+e3WBmVkpZbiaNfN6V3zfLj6WIIHse4a3tErcF1ERPI13NkQI91qc/5MZjQ6IOZmQdQ/Iv+fEwb/M/a7ZDBTt9aqHYYGHLTWArss2KUr9xv983WJgcsNwqqvra5fScQmrsxxZigbufp86JfwpF41luaVY6INZvselIIy0h90RUg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(346002)(376002)(136003)(39860400002)(366004)(110136005)(6636002)(2906002)(55016002)(9686003)(5660300002)(966005)(71200400001)(66446008)(33656002)(26005)(64756008)(86362001)(66476007)(66946007)(478600001)(76116006)(8936002)(7696005)(52536014)(53546011)(6506007)(66556008)(83380400001)(186003)(316002)(8676002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?ega32a9ej9xUC3nJE5i6I0TDM+/PcbcH749a4dhLBkpKBCIoccc+34o4XF/9?= =?us-ascii?Q?8OWvfLVqbq2qGbI674XBe25kXfkV1nk53rNt3hV9LVLDA8rW35FLoZyjUxD8?= =?us-ascii?Q?AgQwUIyJmzetRTqoKYLZtIdy3vQSKhn3ThT4ylHo+JJYYAiYUwFJCEtNpfLN?= =?us-ascii?Q?9eAVwGvmzzre1mXDvUgaoiuEWnsur+BNJnOu+MrcYqCpFjzdMXXhldnDiudn?= =?us-ascii?Q?cG8s2ORly1nuNrX4Wm2rqGeNwQfXDX9VkghWF5z31s+rF6SqA9SQUecNp9Me?= =?us-ascii?Q?2e9v+2esCmb9ibUD7abAn1n3vg+RnSLNl5cWReRI2T3FR5yNsvF72Fa8xVg3?= =?us-ascii?Q?2kj5m4Agrk0YL1mQejvIbVAIzPT1twyS9RdLtP4e3vzoXKVqGT6rs0Ku/Ldy?= =?us-ascii?Q?XtlBStPSuyab91t9te0maesvLRp1eHlsOtjQGYMt49NUEziy1AtXre+Y3I3v?= =?us-ascii?Q?zyGOEkZJakmSasXMfvSkKFp72sn/pgaYLof2i0sAUWf6bXiRvR1bp3AZvtwB?= =?us-ascii?Q?Ac5VML5HPAyDoesb5KUlqYQg3DrFBsvzXpPVmeTN+UdmFp6cWn4rm2J8FvSx?= =?us-ascii?Q?iyd2/fGvfBNk9MPWzfBv9duXbBEjxyqPKjb/vhKfKsUBpVXbV+CTHx1qjmIO?= =?us-ascii?Q?qAg8PMRMzHSuc3Fpfg7x9L+xysuyNXJArlNQihYQ/5vJNi7Bqgy7HjIokgw0?= =?us-ascii?Q?N87aVTMCVFCMfmKUaXUhVcEsDVvtdhoRrza6N80d/TEegwDH/rUb4734iVwj?= =?us-ascii?Q?86v2Ec/Q2FXqsxI36cG4M29imz7/CxhMARAHDGjA18tABWRncnvWWJZZg0ju?= =?us-ascii?Q?jVDN7Xzy10+FPnFmmSGBFV6/AlhdlrO96873kv6vKr/IN3T+TKU4IrkHx0wX?= =?us-ascii?Q?71u1ZWlQfYvfT9JHppNb79DQcvkT13B+zRcnWZHB48UVIUWzKXRxrLK1RC0V?= =?us-ascii?Q?GD3M/VQNtgJjOtJpmbVNVCFyd8Vc9xVhtGfcKx6pFsj8j033c9k/TzsZWWsk?= =?us-ascii?Q?chSS5RDb8UlCChOY4GoWi3ivThQ4ZQLmmVCJiAUh+PtqA0FSe8rdj/+4mEXO?= =?us-ascii?Q?MKkSKq9dS7fNbr0b1RperKMWw1STrVQ0htJs767GNrofY+KhPPnTaCJlr/5m?= =?us-ascii?Q?VnEltrT+L4Vt10s7yvQUdPgewvmhE47+57mg8qkgZ7On3L5eFo/YdlguwnPs?= =?us-ascii?Q?KLAOcrxlTZz54Dc1SVEEI2IiQcZ4H2L5G0/Q/7uAWKFV5kBpZul6XXKczKf3?= =?us-ascii?Q?R0+RiLUJA3bddkTi0fLV4t5v8FZxWc9UmXIG9LPxT0S4YYIsZqZCF27uMpgV?= =?us-ascii?Q?yCc=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67d8754f-461f-4f53-c474-08d8e759f1b4 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Mar 2021 02:27:56.5457 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: tRU+cmQ8N3gw4nNH8i6fqMauV/rAsaQp72LeqGNCZ5DEvXVZaGBat/gVeCDNC1L5/8ZbsEJJW8iOsjs5u4B7yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5278 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This patch looks good to me. After you remove the duplicated arm copyright, Reviewed-by: Bob Feng -----Original Message----- From: devel@edk2.groups.io On Behalf Of PierreGondo= is Sent: Wednesday, March 10, 2021 12:17 AM To: devel@edk2.groups.io; Feng, Bob C ; gaoliming@by= osoft.com.cn; Chen, Christine Subject: [edk2-devel] [PATCH v1 1/1] BaseTools/Ecc: Make Ecc only check fi= rst include guard From: Pierre Gondois The Ecc tool checks the format of the include guard. This check is current= ly done on all the names following the '#ifndef' statement. It should only be done on the first include guard. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3252 Signed-off-by: Pierre Gondois --- The changes can be seen at: https://github.com/PierreARM/edk2/tree/1640_Ec= c_tool_corrections BaseTools/Source/Python/Ecc/Check.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Pytho= n/Ecc/Check.py index 7a012617fd35..d82b42de0119 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -3,6 +3,7 @@ # # Copyright (c) 2021, Arm Limited. All rights reserved.
# Copyright = (c) 2008 - 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2021, Arm Limited. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # from __future__ import= absolute_import @@ -1437,11 +1438,13 @@ class Check(object): SqlCommand =3D """select ID, Value from %s where Model =3D %s= """ % (FileTable, MODEL_IDENTIFIER_MACRO_IFNDEF) RecordSet =3D EccGlobalData.gDb.TblFile.Exec(SqlCommand) - for Record in RecordSet: - Name =3D Record[1].replace('#ifndef', '').strip() + if RecordSet: + # Only check the first ifndef statement of the file + FirstDefine =3D sorted(RecordSet, key=3Dlambda Record: Re= cord[0])[0] + Name =3D FirstDefine[1].replace('#ifndef', '').strip() if Name[0] =3D=3D '_' or Name[-1] !=3D '_' or Name[-2] = =3D=3D '_': if not EccGlobalData.gException.IsException(ERROR_NAM= ING_CONVENTION_CHECK_IFNDEF_STATEMENT, Name): - EccGlobalData.gDb.TblReport.Insert(ERROR_NAMING_C= ONVENTION_CHECK_IFNDEF_STATEMENT, OtherMsg=3D"The #ifndef name [%s] does no= t follow the rules" % (Name), BelongsToTable=3DFileTable, BelongsToItem=3DR= ecord[0]) + + EccGlobalData.gDb.TblReport.Insert(ERROR_NAMING_CONVENTION_CHECK_IFNDE + F_STATEMENT, OtherMsg=3D"The #ifndef name [%s] does not follow the=20 + rules" % (Name), BelongsToTable=3DFileTable,=20 + BelongsToItem=3DFirstDefine[0]) # Rule for path name, variable name and function name # 1. First character should be upper case -- 2.17.1