zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a blacklist instead of whitelist for cpplint

Browse Source 
BUG=webrtc:5149
NOTRY=True

Review-Url: https://codereview.webrtc.org/2766633002
Cr-Commit-Position: refs/heads/master@{#17355}
This commit is contained in:
oprypin
2017-03-23 03:17:02 -07:00
committed by Commit bot
parent 7007bcf5b3
commit 2aa463f721
1 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
PRESUBMIT.py
View File

@ -13,24 +13,34 @@ import subprocess
import sys import sys
# Directories that will be scanned by cpplint by the presubmit script. # Files and directories that are *skipped* by cpplint in the presubmit script.
CPPLINT_DIRS = [ CPPLINT_BLACKLIST = [
'webrtc/api', 'tools-webrtc',
'webrtc/audio', 'webrtc/base',
'webrtc/call', 'webrtc/examples/objc',
'webrtc/common_audio', 'webrtc/media',
'webrtc/common_video', 'webrtc/modules/audio_coding',
'webrtc/examples', 'webrtc/modules/audio_conference_mixer',
'webrtc/modules/audio_mixer', 'webrtc/modules/audio_device',
'webrtc/modules/bitrate_controller', 'webrtc/modules/audio_processing',
'webrtc/modules/congestion_controller', 'webrtc/modules/desktop_capture',
'webrtc/modules/pacing', 'webrtc/modules/include/module_common_types.h',
'webrtc/modules/remote_bitrate_estimator', 'webrtc/modules/media_file',
'webrtc/modules/rtp_rtcp', 'webrtc/modules/utility',
'webrtc/modules/video_coding', 'webrtc/modules/video_capture',
'webrtc/modules/video_processing', 'webrtc/p2p',
'webrtc/tools', 'webrtc/pc',
'webrtc/video', 'webrtc/sdk/android/src/jni',
'webrtc/sdk/objc',
'webrtc/system_wrappers',
'webrtc/test',
'webrtc/voice_engine',
'webrtc/call.h',
'webrtc/common_types.h',
'webrtc/common_types.cc',
'webrtc/video_decoder.h',
'webrtc/video_encoder.h',
'webrtc/video_send_stream.h',
] ]
# These filters will always be removed, even if the caller specifies a filter # These filters will always be removed, even if the caller specifies a filter
@ -209,17 +219,17 @@ def _CheckNoFRIEND_TEST(input_api, output_api):
'use FRIEND_TEST_ALL_PREFIXES() instead.\n' + '\n'.join(problems))] 'use FRIEND_TEST_ALL_PREFIXES() instead.\n' + '\n'.join(problems))]
def _IsLintWhitelisted(whitelist_dirs, file_path): def _IsLintBlacklisted(blacklist_paths, file_path):
""" Checks if a file is whitelisted for lint check.""" """ Checks if a file is blacklisted for lint check."""
for path in whitelist_dirs: for path in blacklist_paths:
if os.path.dirname(file_path).startswith(path): if file_path == path or os.path.dirname(file_path).startswith(path):
return True return True
return False return False
def _CheckApprovedFilesLintClean(input_api, output_api, def _CheckApprovedFilesLintClean(input_api, output_api,
source_file_filter=None): source_file_filter=None):
"""Checks that all new or whitelisted .cc and .h files pass cpplint.py. """Checks that all new or non-blacklisted .cc and .h files pass cpplint.py.
This check is based on _CheckChangeLintsClean in This check is based on _CheckChangeLintsClean in
depot_tools/presubmit_canned_checks.py but has less filters and only checks depot_tools/presubmit_canned_checks.py but has less filters and only checks
added files.""" added files."""
@ -235,19 +245,20 @@ def _CheckApprovedFilesLintClean(input_api, output_api,
lint_filters.extend(BLACKLIST_LINT_FILTERS) lint_filters.extend(BLACKLIST_LINT_FILTERS)
cpplint._SetFilters(','.join(lint_filters)) cpplint._SetFilters(','.join(lint_filters))
# Create a platform independent whitelist for the CPPLINT_DIRS. # Create a platform independent blacklist for cpplint.
whitelist_dirs = [input_api.os_path.join(*path.split('/')) blacklist_paths = [input_api.os_path.join(*path.split('/'))
for path in CPPLINT_DIRS] for path in CPPLINT_BLACKLIST]
# Use the strictest verbosity level for cpplint.py (level 1) which is the # Use the strictest verbosity level for cpplint.py (level 1) which is the
# default when running cpplint.py from command line. # default when running cpplint.py from command line. To make it possible to
# To make it possible to work with not-yet-converted code, we're only applying # work with not-yet-converted code, we're only applying it to new (or
# it to new (or moved/renamed) files and files listed in LINT_FOLDERS. # moved/renamed) files and files not listed in CPPLINT_BLACKLIST.
verbosity_level = 1 verbosity_level = 1
files = [] files = []
for f in input_api.AffectedSourceFiles(source_file_filter): for f in input_api.AffectedSourceFiles(source_file_filter):
# Note that moved/renamed files also count as added. # Note that moved/renamed files also count as added.
if f.Action() == 'A' or _IsLintWhitelisted(whitelist_dirs, f.LocalPath()): if f.Action() == 'A' or not _IsLintBlacklisted(blacklist_paths,
f.LocalPath()):
files.append(f.AbsoluteLocalPath()) files.append(f.AbsoluteLocalPath())
for file_name in files: for file_name in files: