admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use input_api.change.RepositoryRoot instead of finding src/ dir

Browse Source 
input_api provides a method to find the repo root so we don't have
to find it ourselves.

Bug: b/333744051
Change-Id: I95eaffba8b65de8ae3a13f6cd4874879ebd0a464
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357902
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Christoffer Dewerin <jansson@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42694}
This commit is contained in:
Gavin Mak 2024-07-26 06:33:11 +00:00 committed by WebRTC LUCI CQ
parent cbb13bba86
commit fa934326db
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PRESUBMIT.py
View File

@ -133,14 +133,6 @@ DEPS_RE = re.compile(r'\bdeps \+?= \[(?P<deps>.*?)\]',
FILE_PATH_RE = re.compile(r'"(?P<file_path>(\w|\/)+)(?P<extension>\.\w+)"') FILE_PATH_RE = re.compile(r'"(?P<file_path>(\w|\/)+)(?P<extension>\.\w+)"')
def FindSrcDirPath(starting_dir):
"""Returns the abs path to the src/ dir of the project."""
src_dir = starting_dir
while os.path.basename(src_dir) != 'src':
src_dir = os.path.normpath(os.path.join(src_dir, os.pardir))
return src_dir
@contextmanager @contextmanager
def _AddToPath(*paths): def _AddToPath(*paths):
original_sys_path = sys.path original_sys_path = sys.path
@ -659,7 +651,7 @@ def CheckGnGen(input_api, output_api):
input_api.os_path.join(input_api.PresubmitLocalPath(), input_api.os_path.join(input_api.PresubmitLocalPath(),
'tools_webrtc', 'presubmit_checks_lib')): 'tools_webrtc', 'presubmit_checks_lib')):
from build_helpers import RunGnCheck from build_helpers import RunGnCheck
errors = RunGnCheck(FindSrcDirPath(input_api.PresubmitLocalPath()))[:5] errors = RunGnCheck(input_api.change.RepositoryRoot())[:5]
if errors: if errors:
return [ return [
output_api.PresubmitPromptWarning( output_api.PresubmitPromptWarning(
@ -681,8 +673,8 @@ def CheckUnwantedDependencies(input_api, output_api, source_file_filter):
# We need to wait until we have an input_api object and use this # We need to wait until we have an input_api object and use this
# roundabout construct to import checkdeps because this file is # roundabout construct to import checkdeps because this file is
# eval-ed and thus doesn't have __file__. # eval-ed and thus doesn't have __file__.
src_path = FindSrcDirPath(input_api.PresubmitLocalPath()) repo_root = input_api.change.RepositoryRoot()
checkdeps_path = input_api.os_path.join(src_path, 'buildtools', checkdeps_path = input_api.os_path.join(repo_root, 'buildtools',
'checkdeps') 'checkdeps')
if not os.path.exists(checkdeps_path): if not os.path.exists(checkdeps_path):
return [ return [