| OLD | NEW |
| 1 #!/bin/env python | 1 #!/bin/env python |
| 2 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2006-2008 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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 for t in self._test_types: | 340 for t in self._test_types: |
| 341 test_types.append(t(self._options.platform, | 341 test_types.append(t(self._options.platform, |
| 342 self._options.results_directory)) | 342 self._options.results_directory)) |
| 343 | 343 |
| 344 if self._options.startup_dialog: | 344 if self._options.startup_dialog: |
| 345 shell_args.append('--testshell-startup-dialog') | 345 shell_args.append('--testshell-startup-dialog') |
| 346 | 346 |
| 347 if self._options.gp_fault_error_box: | 347 if self._options.gp_fault_error_box: |
| 348 shell_args.append('--gp-fault-error-box') | 348 shell_args.append('--gp-fault-error-box') |
| 349 | 349 |
| 350 if self._options.winhttp: | |
| 351 shell_args.append('--winhttp') | |
| 352 | |
| 353 # larger timeout if page heap is enabled. | 350 # larger timeout if page heap is enabled. |
| 354 if self._options.time_out_ms: | 351 if self._options.time_out_ms: |
| 355 shell_args.append('--time-out-ms=' + self._options.time_out_ms) | 352 shell_args.append('--time-out-ms=' + self._options.time_out_ms) |
| 356 | 353 |
| 357 thread = test_shell_thread.TestShellThread(filename_queue, | 354 thread = test_shell_thread.TestShellThread(filename_queue, |
| 358 test_shell_command, | 355 test_shell_command, |
| 359 test_types, | 356 test_types, |
| 360 test_args, | 357 test_args, |
| 361 shell_args, | 358 shell_args, |
| 362 self._options) | 359 self._options) |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 default=False, | 761 default=False, |
| 765 help="create a dialog on test_shell.exe startup") | 762 help="create a dialog on test_shell.exe startup") |
| 766 option_parser.add_option("", "--gp-fault-error-box", action="store_true", | 763 option_parser.add_option("", "--gp-fault-error-box", action="store_true", |
| 767 default=False, | 764 default=False, |
| 768 help="enable Windows GP fault error box") | 765 help="enable Windows GP fault error box") |
| 769 option_parser.add_option("", "--wrapper", | 766 option_parser.add_option("", "--wrapper", |
| 770 help="wrapper command to insert before invocations " | 767 help="wrapper command to insert before invocations " |
| 771 "of test_shell; option is split on whitespace " | 768 "of test_shell; option is split on whitespace " |
| 772 "before running. (example: " | 769 "before running. (example: " |
| 773 "--wrapper='valgrind --smc-check=all')") | 770 "--wrapper='valgrind --smc-check=all')") |
| 774 option_parser.add_option("", "--winhttp", action="store_true", | |
| 775 default=False, | |
| 776 help="Use WinHTTP stack") | |
| 777 option_parser.add_option("", "--test-list", action="append", | 771 option_parser.add_option("", "--test-list", action="append", |
| 778 help="read list of tests to run from file", | 772 help="read list of tests to run from file", |
| 779 metavar="FILE") | 773 metavar="FILE") |
| 780 option_parser.add_option("", "--nocheck-sys-deps", action="store_true", | 774 option_parser.add_option("", "--nocheck-sys-deps", action="store_true", |
| 781 default=False, | 775 default=False, |
| 782 help="Don't check the system dependencies (themes)") | 776 help="Don't check the system dependencies (themes)") |
| 783 option_parser.add_option("", "--randomize-order", action="store_true", | 777 option_parser.add_option("", "--randomize-order", action="store_true", |
| 784 default=False, | 778 default=False, |
| 785 help=("Run tests in random order (useful for " | 779 help=("Run tests in random order (useful for " |
| 786 "tracking down corruption)")) | 780 "tracking down corruption)")) |
| 787 option_parser.add_option("", "--run-chunk", | 781 option_parser.add_option("", "--run-chunk", |
| 788 default=None, | 782 default=None, |
| 789 help=("Run a specified chunk (n:l), the nth of len l" | 783 help=("Run a specified chunk (n:l), the nth of len l" |
| 790 ", of the layout tests")) | 784 ", of the layout tests")) |
| 791 options, args = option_parser.parse_args() | 785 options, args = option_parser.parse_args() |
| 792 main(options, args) | 786 main(options, args) |
| OLD | NEW |