From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jordan.l.justen@intel.com>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by ml01.01.org (Postfix) with ESMTPS id 038FF1A1DEF
 for <edk2-devel@lists.01.org>; Thu, 20 Oct 2016 11:38:09 -0700 (PDT)
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
 by fmsmga103.fm.intel.com with ESMTP; 20 Oct 2016 11:38:09 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.31,372,1473145200"; d="scan'208";a="21784663"
Received: from jessica1-mobl.amr.corp.intel.com (HELO localhost)
 ([10.252.136.91])
 by fmsmga006.fm.intel.com with ESMTP; 20 Oct 2016 11:38:09 -0700
MIME-Version: 1.0
To: Yonghong Zhu <yonghong.zhu@intel.com>,  edk2-devel@lists.01.org
Message-ID: <147698868914.3074.15428705411255435110@jljusten-ivb>
From: Jordan Justen <jordan.l.justen@intel.com>
In-Reply-To: <1476927316-16028-1-git-send-email-yonghong.zhu@intel.com>
Cc: "Liming Gao" <liming.gao@intel.com>
References: <1476927316-16028-1-git-send-email-yonghong.zhu@intel.com>
User-Agent: alot/0.3.7
Date: Thu, 20 Oct 2016 11:38:09 -0700
Subject: Re: [Patch 3/3 V3] 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  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Oct 2016 18:38:10 -0000
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

On 2016-10-19 18:35:16, 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 <liming.gao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Scripts/PatchCheck.py | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
> =

> diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchChe=
ck.py
> index 455c130..177a8d9 100755
> --- a/BaseTools/Scripts/PatchCheck.py
> +++ b/BaseTools/Scripts/PatchCheck.py
> @@ -338,10 +338,19 @@ 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* \( \s*
> +                        (?: DEBUG_[A-Z_]+ \s* \| \s*)*
> +                        EFI_D_ ([A-Z_]+)
> +
> +                   ''',
> +                   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 +364,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<cmd>
>                                         ^ diff \s+ --git \s+ a/.+ \s+ b/.=
+ $
>                                     )
>                                     (?P<index>
> -- =

> 2.6.1.windows.1
> =

> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel