Skip to content

Commit

Permalink
remove OVERRIDE/FINAL presubmit checks now the macros are gone
Browse files Browse the repository at this point in the history
BUG=417463

Review URL: https://codereview.chromium.org/670073003

Cr-Commit-Position: refs/heads/master@{#300681}
  • Loading branch information
mostynb authored and Commit bot committed Oct 22, 2014
1 parent 826d0a0 commit a924ebe
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 78 deletions.
41 changes: 0 additions & 41 deletions base/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
for more details on the presubmit API built into gcl.
"""

import re

BASE_SOURCE_FILES=(r'^base/.*\.(cc|h|mm)$',)

def _CheckNoInterfacesInBase(input_api, output_api):
"""Checks to make sure no files in libbase.a have |@interface|."""
pattern = input_api.re.compile(r'^\s*@interface', input_api.re.MULTILINE)
Expand Down Expand Up @@ -40,45 +36,8 @@ def _CommonChecks(input_api, output_api):
results.extend(_CheckNoInterfacesInBase(input_api, output_api))
return results

def _CheckOverrideFinal(input_api, output_api,
whitelist=BASE_SOURCE_FILES, blacklist=None):
"""Make sure new lines of code don't use the OVERRIDE or FINAL macros."""

# TODO(mostynb): remove this check once the macros are removed
# from base/compiler_specific.h.

errors = []

source_file_filter = lambda x: input_api.FilterSourceFile(
x, white_list=BASE_SOURCE_FILES, black_list=None)

override_files = []
final_files = []

for f in input_api.AffectedSourceFiles(source_file_filter):
contents = input_api.ReadFile(f, 'rb')

# "override" and "final" should be used instead of OVERRIDE/FINAL now.
if re.search(r"\bOVERRIDE\b", contents):
override_files.append(f.LocalPath())

if re.search(r"\bFINAL\b", contents):
final_files.append(f.LocalPath())

if override_files:
return [output_api.PresubmitError(
'These files use OVERRIDE instead of using override:',
items=override_files)]
if final_files:
return [output_api.PresubmitError(
'These files use FINAL instead of using final:',
items=final_files)]

return []

def CheckChangeOnUpload(input_api, output_api):
results = []
results.extend(_CheckOverrideFinal(input_api, output_api))
results.extend(_CommonChecks(input_api, output_api))
return results

Expand Down
37 changes: 0 additions & 37 deletions cc/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,42 +326,6 @@ def CheckForUseOfWrongClock(input_api,
else:
return []

def CheckOverrideFinal(input_api, output_api,
whitelist=CC_SOURCE_FILES, blacklist=None):
"""Make sure new lines of code don't use the OVERRIDE or FINAL macros."""

# TODO(mostynb): remove this check once the macros are removed
# from base/compiler_specific.h.

errors = []

source_file_filter = lambda x: input_api.FilterSourceFile(
x, white_list=CC_SOURCE_FILES, black_list=None)

override_files = []
final_files = []

for f in input_api.AffectedSourceFiles(source_file_filter):
contents = input_api.ReadFile(f, 'rb')

# "override" and "final" should be used instead of OVERRIDE/FINAL now.
if re.search(r"\bOVERRIDE\b", contents):
override_files.append(f.LocalPath())

if re.search(r"\bFINAL\b", contents):
final_files.append(f.LocalPath())

if override_files:
return [output_api.PresubmitError(
'These files use OVERRIDE instead of using override:',
items=override_files)]
if final_files:
return [output_api.PresubmitError(
'These files use FINAL instead of using final:',
items=final_files)]

return []

def CheckChangeOnUpload(input_api, output_api):
results = []
results += CheckAsserts(input_api, output_api)
Expand All @@ -374,7 +338,6 @@ def CheckChangeOnUpload(input_api, output_api):
results += CheckNamespace(input_api, output_api)
results += CheckForUseOfWrongClock(input_api, output_api)
results += FindUselessIfdefs(input_api, output_api)
results += CheckOverrideFinal(input_api, output_api)
results += input_api.canned_checks.CheckPatchFormatted(input_api, output_api)
return results

Expand Down

0 comments on commit a924ebe

Please sign in to comment.