diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-10-17 11:13:47 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-10-21 07:28:01 +0800 |
| commit | c3926cdbbd9c4c884b8f87089e877187ccc63eb2 (patch) | |
| tree | d96286f0d1fd0fe3c67e1393f6ba3c328b5cf120 | |
| parent | e709bbb1ce386c7ac4240fae929cacfcc2bfa5a9 (diff) | |
| download | edk2-platforms-c3926cdbbd9c4c884b8f87089e877187ccc63eb2.tar.xz | |
BaseTools/PatchCheck.py: Update to report error for EFI_D_*
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=143
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>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
| -rwxr-xr-x | BaseTools/Scripts/PatchCheck.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 05f8f6e407..7c3008233c 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -340,6 +340,14 @@ class GitDiffCheck: self.error(*lines)
+ old_debug_re = \
+ 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 = ''
for an_eol in self.line_endings:
@@ -357,6 +365,12 @@ class GitDiffCheck: if len(stripped) < len(line):
self.added_line_error('Trailing whitespace found', line)
+ mo = 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 = re.compile(r'''
(?P<cmd>
^ diff \s+ --git \s+ a/.+ \s+ b/.+ $
|