From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C7B711A1E3E for ; Tue, 18 Oct 2016 11:31:34 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP; 18 Oct 2016 11:31:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,362,1473145200"; d="scan'208";a="1072237338" Received: from ahjahagi-mobl1.amr.corp.intel.com (HELO localhost) ([10.252.140.179]) by fmsmga002.fm.intel.com with ESMTP; 18 Oct 2016 11:31:34 -0700 MIME-Version: 1.0 To: Yonghong Zhu , edk2-devel@lists.01.org Message-ID: <147681549396.11463.15081649592826518087@jljusten-ivb> From: Jordan Justen In-Reply-To: <1476785813-13728-1-git-send-email-yonghong.zhu@intel.com> Cc: "Liming Gao" References: <1476785813-13728-1-git-send-email-yonghong.zhu@intel.com> User-Agent: alot/0.3.7 Date: Tue, 18 Oct 2016 11:31:33 -0700 Subject: Re: [Patch 3/3 V2] BaseTools/PatchCheck.py: Update to report error for EFI_D_* X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Oct 2016 18:31:35 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 2016-10-18 03:16:53, Yonghong Zhu wrote: > In EDK2, DEBUG_* is recommended to be used instead of EFI_D_*. For new > code, they should use DEBUG_* macro. > = > Fixes:https://bugzilla.tianocore.org/show_bug.cgi?id=3D143 > Cc: Liming Gao > Cc: Jordan Justen > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Yonghong Zhu > --- > BaseTools/Scripts/PatchCheck.py | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > = > diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchChe= ck.py > index 05f8f6e..083438c 100755 > --- a/BaseTools/Scripts/PatchCheck.py > +++ b/BaseTools/Scripts/PatchCheck.py > @@ -338,10 +338,16 @@ class GitDiffCheck: > lines.append('File: ' + self.hunk_filename) > lines.append('Line: ' + line) > = > self.error(*lines) > = > + old_debug_re =3D \ > + re.compile(r''' > + DEBUG \s* \( \s* \( .* EFI_D_ ([A-Z_]+) ^^ I recommend changing .* in the regex to \s*. EFI_D_* is the first parameter. The only thing that might appear is a comment, but that could also appear between the parentheses. This would be an unusual place to put a comment. Aside from that, Reviewed-by: Jordan Justen > + ''', > + re.VERBOSE) > + > def check_added_line(self, line): > eol =3D '' > for an_eol in self.line_endings: > if line.endswith(an_eol): > eol =3D an_eol > @@ -355,10 +361,16 @@ class GitDiffCheck: > if ' ' in line: > self.added_line_error('Tab character used', line) > if len(stripped) < len(line): > self.added_line_error('Trailing whitespace found', line) > = > + mo =3D self.old_debug_re.search(line) > + if mo is not None: > + self.added_line_error('EFI_D_' + mo.group(1) + ' was used, ' > + 'but DEBUG_' + mo.group(1) + > + ' is now recommended', line) > + > split_diff_re =3D re.compile(r''' > (?P > ^ diff \s+ --git \s+ a/.+ \s+ b/.= + $ > ) > (?P > -- = > 2.6.1.windows.1 >=20