Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: content/test/PRESUBMIT.py

Issue 563383003: Copy webkit's test_expectations* files over to content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rm test_expectations_w3c.txt Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/test/test_expectations.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/PRESUBMIT.py
diff --git a/webkit/tools/layout_tests/PRESUBMIT.py b/content/test/PRESUBMIT.py
similarity index 86%
copy from webkit/tools/layout_tests/PRESUBMIT.py
copy to content/test/PRESUBMIT.py
index 713d47e3be9bf2058d9b4fc4d0b01d23d6ac2f82..476e8e704ad03ec097964cec206a5d80b3d11ad6 100644
--- a/webkit/tools/layout_tests/PRESUBMIT.py
+++ b/content/test/PRESUBMIT.py
@@ -8,14 +8,20 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
details on the presubmit API built into gcl.
"""
+import os
+import sys
+
TEST_EXPECTATIONS_FILENAMES = ['test_expectations.txt', 'TestExpectations']
def LintTestFiles(input_api, output_api):
current_dir = str(input_api.PresubmitLocalPath())
+ tools_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
+ src_dir = os.path.dirname(tools_dir)
+
# Set 'webkit/tools/layout_tests' in include path.
python_paths = [
current_dir,
- input_api.os_path.join(current_dir, '..', '..', '..', 'tools', 'python')
+ input_api.os_path.join(src_dir, 'tools', 'python')
]
env = input_api.environ.copy()
if env.get('PYTHONPATH'):
@@ -23,8 +29,8 @@ def LintTestFiles(input_api, output_api):
env['PYTHONPATH'] = input_api.os_path.pathsep.join(python_paths)
args = [
input_api.python_executable,
- input_api.os_path.join(current_dir, 'run_webkit_tests.py'),
- '--lint-test-files'
+ input_api.os_path.join(src_dir, 'webkit', 'tools', 'layout_tests',
+ 'run_webkit_tests.py'), '--lint-test-files'
]
subproc = input_api.subprocess.Popen(
args,
« no previous file with comments | « no previous file | content/test/test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698