OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # | 2 # |
3 # Copyright 2013 The Chromium Authors. All rights reserved. | 3 # Copyright 2013 The Chromium Authors. All rights reserved. |
4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
6 | 6 |
7 """Runs all types of tests from one unified interface.""" | 7 """Runs all types of tests from one unified interface.""" |
8 | 8 |
9 import collections | 9 import collections |
10 import logging | 10 import logging |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 '--gtest-also-run-disabled-tests', | 110 '--gtest-also-run-disabled-tests', |
111 dest='run_disabled', action='store_true', | 111 dest='run_disabled', action='store_true', |
112 help='Also run disabled tests if applicable.') | 112 help='Also run disabled tests if applicable.') |
113 option_parser.add_option('-a', '--test-arguments', dest='test_arguments', | 113 option_parser.add_option('-a', '--test-arguments', dest='test_arguments', |
114 default='', | 114 default='', |
115 help='Additional arguments to pass to the test.') | 115 help='Additional arguments to pass to the test.') |
116 option_parser.add_option('-t', dest='timeout', | 116 option_parser.add_option('-t', dest='timeout', |
117 help='Timeout to wait for each test', | 117 help='Timeout to wait for each test', |
118 type='int', | 118 type='int', |
119 default=60) | 119 default=60) |
| 120 option_parser.add_option('--isolate_file_path', |
| 121 '--isolate-file-path', |
| 122 dest='isolate_file_path', |
| 123 help='.isolate file path to override the default ' |
| 124 'path') |
120 # TODO(gkanwar): Move these to Common Options once we have the plumbing | 125 # TODO(gkanwar): Move these to Common Options once we have the plumbing |
121 # in our other test types to handle these commands | 126 # in our other test types to handle these commands |
122 AddCommonOptions(option_parser) | 127 AddCommonOptions(option_parser) |
123 | 128 |
124 | 129 |
125 def AddLinkerTestOptions(option_parser): | 130 def AddLinkerTestOptions(option_parser): |
126 option_parser.usage = '%prog linker' | 131 option_parser.usage = '%prog linker' |
127 option_parser.commands_dict = {} | 132 option_parser.commands_dict = {} |
128 option_parser.example = '%prog linker' | 133 option_parser.example = '%prog linker' |
129 | 134 |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 # TODO(gkanwar): Move this into ProcessGTestOptions once we require -s for | 503 # TODO(gkanwar): Move this into ProcessGTestOptions once we require -s for |
499 # the gtest command. | 504 # the gtest command. |
500 gtest_options = gtest_test_options.GTestOptions( | 505 gtest_options = gtest_test_options.GTestOptions( |
501 options.tool, | 506 options.tool, |
502 options.cleanup_test_files, | 507 options.cleanup_test_files, |
503 options.push_deps, | 508 options.push_deps, |
504 options.test_filter, | 509 options.test_filter, |
505 options.run_disabled, | 510 options.run_disabled, |
506 options.test_arguments, | 511 options.test_arguments, |
507 options.timeout, | 512 options.timeout, |
| 513 options.isolate_file_path, |
508 suite_name) | 514 suite_name) |
509 runner_factory, tests = gtest_setup.Setup(gtest_options, devices) | 515 runner_factory, tests = gtest_setup.Setup(gtest_options, devices) |
510 | 516 |
511 results, test_exit_code = test_dispatcher.RunTests( | 517 results, test_exit_code = test_dispatcher.RunTests( |
512 tests, runner_factory, devices, shard=True, test_timeout=None, | 518 tests, runner_factory, devices, shard=True, test_timeout=None, |
513 num_retries=options.num_retries) | 519 num_retries=options.num_retries) |
514 | 520 |
515 if test_exit_code and exit_code != constants.ERROR_EXIT_CODE: | 521 if test_exit_code and exit_code != constants.ERROR_EXIT_CODE: |
516 exit_code = test_exit_code | 522 exit_code = test_exit_code |
517 | 523 |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
799 | 805 |
800 def main(): | 806 def main(): |
801 signal.signal(signal.SIGUSR1, DumpThreadStacks) | 807 signal.signal(signal.SIGUSR1, DumpThreadStacks) |
802 option_parser = command_option_parser.CommandOptionParser( | 808 option_parser = command_option_parser.CommandOptionParser( |
803 commands_dict=VALID_COMMANDS) | 809 commands_dict=VALID_COMMANDS) |
804 return command_option_parser.ParseAndExecute(option_parser) | 810 return command_option_parser.ParseAndExecute(option_parser) |
805 | 811 |
806 | 812 |
807 if __name__ == '__main__': | 813 if __name__ == '__main__': |
808 sys.exit(main()) | 814 sys.exit(main()) |
OLD | NEW |