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

Side by Side Diff: webkit/tools/layout_tests/PRESUBMIT.py

Issue 10501010: Update layout_tests tool in media/tools and PRESUBMIT.py per test_expectations.txt renames. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/tools/layout_tests/test_expectations_history.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """test_expectations.txt presubmit script. 5 """test_expectations.txt presubmit script.
6 6
7 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for 7 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
8 details on the presubmit API built into gcl. 8 details on the presubmit API built into gcl.
9 """ 9 """
10 10
11 TEST_EXPECTATIONS = 'test_expectations.txt' 11 TEST_EXPECTATIONS_FILENAMES = ['test_expectations.txt', 'TestExpectations']
12 12
13 def LintTestFiles(input_api, output_api): 13 def LintTestFiles(input_api, output_api):
14 current_dir = str(input_api.PresubmitLocalPath()) 14 current_dir = str(input_api.PresubmitLocalPath())
15 # Set 'webkit/tools/layout_tests' in include path. 15 # Set 'webkit/tools/layout_tests' in include path.
16 python_paths = [ 16 python_paths = [
17 current_dir, 17 current_dir,
18 input_api.os_path.join(current_dir, '..', '..', '..', 'tools', 'python') 18 input_api.os_path.join(current_dir, '..', '..', '..', 'tools', 'python')
19 ] 19 ]
20 env = input_api.environ.copy() 20 env = input_api.environ.copy()
21 if env.get('PYTHONPATH'): 21 if env.get('PYTHONPATH'):
(...skipping 16 matching lines...) Expand all
38 is_error = lambda line: (input_api.re.match('^Line:', line) or 38 is_error = lambda line: (input_api.re.match('^Line:', line) or
39 input_api.re.search('ERROR Line:', line)) 39 input_api.re.search('ERROR Line:', line))
40 error = filter(is_error, stdout_data.splitlines()) 40 error = filter(is_error, stdout_data.splitlines())
41 if error: 41 if error:
42 return [output_api.PresubmitError('Lint error\n%s' % '\n'.join(error), 42 return [output_api.PresubmitError('Lint error\n%s' % '\n'.join(error),
43 long_text=stdout_data)] 43 long_text=stdout_data)]
44 return [] 44 return []
45 45
46 def LintTestExpectations(input_api, output_api): 46 def LintTestExpectations(input_api, output_api):
47 for path in input_api.LocalPaths(): 47 for path in input_api.LocalPaths():
48 if TEST_EXPECTATIONS == input_api.os_path.basename(path): 48 if input_api.os_path.basename(path) in TEST_EXPECTATIONS_FILENAMES:
49 return LintTestFiles(input_api, output_api) 49 return LintTestFiles(input_api, output_api)
50 return [] 50 return []
51 51
52 52
53 def CheckChangeOnUpload(input_api, output_api): 53 def CheckChangeOnUpload(input_api, output_api):
54 return LintTestExpectations(input_api, output_api) 54 return LintTestExpectations(input_api, output_api)
55 55
56 def CheckChangeOnCommit(input_api, output_api): 56 def CheckChangeOnCommit(input_api, output_api):
57 return LintTestExpectations(input_api, output_api) 57 return LintTestExpectations(input_api, output_api)
OLDNEW
« no previous file with comments | « media/tools/layout_tests/test_expectations_history.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698