From 814000d7876df07a03a320f9eae8af5da7b340c5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 19 Nov 2015 21:37:43 -0800 Subject: During presubmit, look in parent directories for buildtools/checkdeps. This may be useful when PDFium is not a standalone checkout. R=hans@chromium.org Review URL: https://codereview.chromium.org/1464733002 . --- PRESUBMIT.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 459d3da755..5dd22e25f0 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -19,8 +19,18 @@ def _CheckUnwantedDependencies(input_api, output_api): # eval-ed and thus doesn't have __file__. original_sys_path = sys.path try: - sys.path = sys.path + [input_api.os_path.join( - input_api.PresubmitLocalPath(), 'buildtools', 'checkdeps')] + checkdeps_relpath = input_api.os_path.join('buildtools', 'checkdeps') + checkdeps_basepath = input_api.PresubmitLocalPath() + checkdeps_path = input_api.os_path.join(checkdeps_basepath, + checkdeps_relpath) + while not input_api.os_path.exists(checkdeps_path): + if checkdeps_basepath == input_api.os_path.dirname(checkdeps_basepath): + raise ImportError('Cannot find checkdeps') + checkdeps_basepath = input_api.os_path.dirname(checkdeps_basepath) + checkdeps_path = input_api.os_path.join(checkdeps_basepath, + checkdeps_relpath) + + sys.path.append(checkdeps_path) import checkdeps from cpp_checker import CppChecker from rules import Rule -- cgit v1.2.3