summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 01:31:50 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 01:31:50 +0000
commitbec7e3c3e479216d419281af4bf52151101fb6a9 (patch)
treea47c27ca0a67c5a462e148f999b801285757b24e
parent3bba958a050be8ddc6cc6fbae33e2ea94b310935 (diff)
downloadchromium_src-bec7e3c3e479216d419281af4bf52151101fb6a9.zip
chromium_src-bec7e3c3e479216d419281af4bf52151101fb6a9.tar.gz
chromium_src-bec7e3c3e479216d419281af4bf52151101fb6a9.tar.bz2
Add presubmit check to lint test files.
BUG=5339 TEST=report error by "gcl presubmit" with bad test_expectations.txt. Review URL: http://codereview.chromium.org/160442 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22456 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/PRESUBMIT.py57
1 files changed, 57 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/PRESUBMIT.py b/webkit/tools/layout_tests/PRESUBMIT.py
new file mode 100644
index 0000000..adce6dc
--- /dev/null
+++ b/webkit/tools/layout_tests/PRESUBMIT.py
@@ -0,0 +1,57 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""test_expectations.txt presubmit script.
+
+See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
+details on the presubmit API built into gcl.
+"""
+
+TEST_EXPECTATIONS = 'test_expectations.txt'
+
+def LintTestFiles(input_api, output_api):
+ current_dir = input_api.PresubmitLocalPath()
+ # Set 'webkit/tools/layout_tests' in include path.
+ python_paths = [
+ current_dir,
+ input_api.os_path.join(current_dir, '..', '..', '..', 'tools', 'python')
+ ]
+ env = input_api.environ.copy()
+ if env.get('PYTHONPATH'):
+ python_paths.append(env['PYTHONPATH'])
+ 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'
+ ]
+ subproc = input_api.subprocess.Popen(
+ args,
+ cwd=current_dir,
+ env=env,
+ stdin=input_api.subprocess.PIPE,
+ stdout=input_api.subprocess.PIPE,
+ stderr=input_api.subprocess.STDOUT)
+ stdout_data = subproc.communicate()[0]
+ # TODO(ukai): consolidate run_webkit_tests --lint-test-files reports.
+ is_error = lambda line: (input_api.re.match('^Line:', line) or
+ input_api.re.search('ERROR Line:', line))
+ error = filter(is_error, stdout_data.splitlines())
+ if error:
+ return [output_api.PresubmitError('Lint error\n%s' % '\n'.join(error),
+ long_text=stdout_data)]
+ return []
+
+def LintTestExpectations(input_api, output_api):
+ for path in input_api.LocalPaths():
+ if TEST_EXPECTATIONS == input_api.os_path.basename(path):
+ return LintTestFiles(input_api, output_api)
+ return []
+
+
+def CheckChangeOnUpload(input_api, output_api):
+ return LintTestExpectations(input_api, output_api)
+
+def CheckChangeOnCommit(input_api, output_api):
+ return LintTestExpectations(input_api, output_api)