Revision: 21642
Author: [email protected]
Date: Tue Jun 3 13:39:42 2014 UTC
Log: Add DEPS files and run checkdeps in presubmit check
BUG=none
[email protected]
LOG=n
Review URL: https://codereview.chromium.org/312763002
http://code.google.com/p/v8/source/detail?r=21642
Added:
/branches/bleeding_edge/src/DEPS
/branches/bleeding_edge/src/base/DEPS
/branches/bleeding_edge/src/libplatform/DEPS
/branches/bleeding_edge/test/cctest/DEPS
/branches/bleeding_edge/tools/DEPS
Modified:
/branches/bleeding_edge/DEPS
/branches/bleeding_edge/PRESUBMIT.py
=======================================
--- /dev/null
+++ /branches/bleeding_edge/src/DEPS Tue Jun 3 13:39:42 2014 UTC
@@ -0,0 +1,6 @@
+include_rules = [
+ "+src",
+
+ # TODO(jochen): Enable this.
+ #"-src/libplatform",
+]
=======================================
--- /dev/null
+++ /branches/bleeding_edge/src/base/DEPS Tue Jun 3 13:39:42 2014 UTC
@@ -0,0 +1,4 @@
+include_rules = [
+ "-src",
+ "+src/base",
+]
=======================================
--- /dev/null
+++ /branches/bleeding_edge/src/libplatform/DEPS Tue Jun 3 13:39:42 2014
UTC
@@ -0,0 +1,6 @@
+include_rules = [
+ # TODO(jochen): Enable this.
+ #"-src",
+ "+src/base",
+ "+src/libplatform",
+]
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/cctest/DEPS Tue Jun 3 13:39:42 2014 UTC
@@ -0,0 +1,3 @@
+include_rules = [
+ "+src",
+]
=======================================
--- /dev/null
+++ /branches/bleeding_edge/tools/DEPS Tue Jun 3 13:39:42 2014 UTC
@@ -0,0 +1,8 @@
+include_rules = [
+ "+src",
+]
+
+# checkdeps.py shouldn't check for includes in these directories:
+skip_child_includes = [
+ "gcmole",
+]
=======================================
--- /branches/bleeding_edge/DEPS Tue Jun 3 12:01:50 2014 UTC
+++ /branches/bleeding_edge/DEPS Tue Jun 3 13:39:42 2014 UTC
@@ -30,6 +30,18 @@
Var("chromium_trunk") + "/tools/third_party/python_26@89111",
}
}
+
+include_rules = [
+ # Everybody can use some things.
+ "+include",
+ "+unicode",
+]
+
+# checkdeps.py shouldn't check for includes in these directories:
+skip_child_includes = [
+ "build",
+ "third_party",
+]
hooks = [
{
=======================================
--- /branches/bleeding_edge/PRESUBMIT.py Wed May 14 11:11:22 2014 UTC
+++ /branches/bleeding_edge/PRESUBMIT.py Tue Jun 3 13:39:42 2014 UTC
@@ -31,6 +31,9 @@
for more details about the presubmit API built into gcl.
"""
+import sys
+
+
def _V8PresubmitChecks(input_api, output_api):
"""Runs the V8 presubmit checks."""
import sys
@@ -49,12 +52,66 @@
return results
+def _CheckUnwantedDependencies(input_api, output_api):
+ """Runs checkdeps on #include statements added in this
+ change. Breaking - rules is an error, breaking ! rules is a
+ warning.
+ """
+ # We need to wait until we have an input_api object and use this
+ # roundabout construct to import checkdeps because this file is
+ # 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')]
+ import checkdeps
+ from cpp_checker import CppChecker
+ from rules import Rule
+ finally:
+ # Restore sys.path to what it was before.
+ sys.path = original_sys_path
+
+ added_includes = []
+ for f in input_api.AffectedFiles():
+ if not CppChecker.IsCppFile(f.LocalPath()):
+ continue
+
+ changed_lines = [line for line_num, line in f.ChangedContents()]
+ added_includes.append([f.LocalPath(), changed_lines])
+
+ deps_checker = checkdeps.DepsChecker(input_api.PresubmitLocalPath())
+
+ error_descriptions = []
+ warning_descriptions = []
+ for path, rule_type, rule_description in
deps_checker.CheckAddedCppIncludes(
+ added_includes):
+ description_with_path = '%s\n %s' % (path, rule_description)
+ if rule_type == Rule.DISALLOW:
+ error_descriptions.append(description_with_path)
+ else:
+ warning_descriptions.append(description_with_path)
+
+ results = []
+ if error_descriptions:
+ results.append(output_api.PresubmitError(
+ 'You added one or more #includes that violate checkdeps rules.',
+ error_descriptions))
+ if warning_descriptions:
+ results.append(output_api.PresubmitPromptOrNotify(
+ 'You added one or more #includes of files that are temporarily\n'
+ 'allowed but being removed. Can you avoid introducing the\n'
+ '#include? See relevant DEPS file(s) for details and contacts.',
+ warning_descriptions))
+ return results
+
+
def _CommonChecks(input_api, output_api):
"""Checks common to both upload and commit."""
results = []
results.extend(input_api.canned_checks.CheckOwners(
input_api, output_api, source_file_filter=None))
results.extend(_V8PresubmitChecks(input_api, output_api))
+ results.extend(_CheckUnwantedDependencies(input_api, output_api))
return results
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
