| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Run layout tests using the test_shell. | 6 """Run layout tests using the test_shell. |
| 7 | 7 |
| 8 This is a port of the existing webkit test script run-webkit-tests. | 8 This is a port of the existing webkit test script run-webkit-tests. |
| 9 | 9 |
| 10 The TestRunner class runs a series of tests (TestType interface) against a set | 10 The TestRunner class runs a series of tests (TestType interface) against a set |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 else: | 194 else: |
| 195 raise err | 195 raise err |
| 196 | 196 |
| 197 def PrepareListsAndPrintOutput(self): | 197 def PrepareListsAndPrintOutput(self): |
| 198 """Create appropriate subsets of test lists and returns a ResultSummary | 198 """Create appropriate subsets of test lists and returns a ResultSummary |
| 199 object. Also prints expected test counts.""" | 199 object. Also prints expected test counts.""" |
| 200 | 200 |
| 201 # Remove skipped - both fixable and ignored - files from the | 201 # Remove skipped - both fixable and ignored - files from the |
| 202 # top-level list of files to test. | 202 # top-level list of files to test. |
| 203 num_all_test_files = len(self._test_files) | 203 num_all_test_files = len(self._test_files) |
| 204 skipped = () | 204 skipped = set() |
| 205 if num_all_test_files > 1 and not self._options.force: | 205 if num_all_test_files > 1 and not self._options.force: |
| 206 skipped = self._expectations.GetTestsWithResultType( | 206 skipped = self._expectations.GetTestsWithResultType( |
| 207 test_expectations.SKIP) | 207 test_expectations.SKIP) |
| 208 self._test_files -= skipped | 208 self._test_files -= skipped |
| 209 | 209 |
| 210 # Create a sorted list of test files so the subset chunk, if used, contains | 210 # Create a sorted list of test files so the subset chunk, if used, contains |
| 211 # alphabetically consecutive tests. | 211 # alphabetically consecutive tests. |
| 212 self._test_files_list = list(self._test_files) | 212 self._test_files_list = list(self._test_files) |
| 213 if self._options.randomize_order: | 213 if self._options.randomize_order: |
| 214 random.shuffle(self._test_files_list) | 214 random.shuffle(self._test_files_list) |
| (...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1457 "this script.")) | 1457 "this script.")) |
| 1458 option_parser.add_option("", "--find-baselines", action="store_true", | 1458 option_parser.add_option("", "--find-baselines", action="store_true", |
| 1459 default=False, | 1459 default=False, |
| 1460 help="Prints a table mapping tests to their " | 1460 help="Prints a table mapping tests to their " |
| 1461 "expected results") | 1461 "expected results") |
| 1462 option_parser.add_option("", "--experimental-fully-parallel", | 1462 option_parser.add_option("", "--experimental-fully-parallel", |
| 1463 action="store_true", default=False, | 1463 action="store_true", default=False, |
| 1464 help="run all tests in parallel") | 1464 help="run all tests in parallel") |
| 1465 options, args = option_parser.parse_args() | 1465 options, args = option_parser.parse_args() |
| 1466 main(options, args) | 1466 main(options, args) |
| OLD | NEW |