Commit a924ebe9 authored by mostynb's avatar mostynb Committed by Commit bot

remove OVERRIDE/FINAL presubmit checks now the macros are gone

BUG=417463

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

Cr-Commit-Position: refs/heads/master@{#300681}
parent 826d0a0c
...@@ -8,10 +8,6 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts ...@@ -8,10 +8,6 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
for more details on the presubmit API built into gcl. 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): def _CheckNoInterfacesInBase(input_api, output_api):
"""Checks to make sure no files in libbase.a have |@interface|.""" """Checks to make sure no files in libbase.a have |@interface|."""
pattern = input_api.re.compile(r'^\s*@interface', input_api.re.MULTILINE) pattern = input_api.re.compile(r'^\s*@interface', input_api.re.MULTILINE)
...@@ -40,45 +36,8 @@ def _CommonChecks(input_api, output_api): ...@@ -40,45 +36,8 @@ def _CommonChecks(input_api, output_api):
results.extend(_CheckNoInterfacesInBase(input_api, output_api)) results.extend(_CheckNoInterfacesInBase(input_api, output_api))
return results 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): def CheckChangeOnUpload(input_api, output_api):
results = [] results = []
results.extend(_CheckOverrideFinal(input_api, output_api))
results.extend(_CommonChecks(input_api, output_api)) results.extend(_CommonChecks(input_api, output_api))
return results return results
......
...@@ -326,42 +326,6 @@ def CheckForUseOfWrongClock(input_api, ...@@ -326,42 +326,6 @@ def CheckForUseOfWrongClock(input_api,
else: else:
return [] 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): def CheckChangeOnUpload(input_api, output_api):
results = [] results = []
results += CheckAsserts(input_api, output_api) results += CheckAsserts(input_api, output_api)
...@@ -374,7 +338,6 @@ def CheckChangeOnUpload(input_api, output_api): ...@@ -374,7 +338,6 @@ def CheckChangeOnUpload(input_api, output_api):
results += CheckNamespace(input_api, output_api) results += CheckNamespace(input_api, output_api)
results += CheckForUseOfWrongClock(input_api, output_api) results += CheckForUseOfWrongClock(input_api, output_api)
results += FindUselessIfdefs(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) results += input_api.canned_checks.CheckPatchFormatted(input_api, output_api)
return results return results
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment