Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 import optparse | 4 import optparse |
| 5 import sys | 5 import sys |
| 6 import shlex | 6 import shlex |
| 7 import logging | 7 import logging |
| 8 import copy | 8 import copy |
| 9 | 9 |
| 10 from telemetry import browser_finder | 10 from telemetry import browser_finder |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 group.add_option('--pageset-repeat', dest='pageset_repeat', default=1, | 96 group.add_option('--pageset-repeat', dest='pageset_repeat', default=1, |
| 97 help='Number of times to repeat the entire pageset ' + | 97 help='Number of times to repeat the entire pageset ' + |
| 98 'before finishing.') | 98 'before finishing.') |
| 99 group.add_option('--test-shuffle', action='store_true', dest='test_shuffle', | 99 group.add_option('--test-shuffle', action='store_true', dest='test_shuffle', |
| 100 help='Shuffle the order of pages within a pageset.') | 100 help='Shuffle the order of pages within a pageset.') |
| 101 group.add_option('--test-shuffle-order-file', | 101 group.add_option('--test-shuffle-order-file', |
| 102 dest='test_shuffle_order_file', default=None, | 102 dest='test_shuffle_order_file', default=None, |
| 103 help='Filename of an output of a previously run test on the current ' + | 103 help='Filename of an output of a previously run test on the current ' + |
| 104 'pageset. The tests will run in the same order again, overriding ' + | 104 'pageset. The tests will run in the same order again, overriding ' + |
| 105 'what is specified by --page-repeat and --pageset-repeat.') | 105 'what is specified by --page-repeat and --pageset-repeat.') |
| 106 group.add_option('--page-filter', dest='page_filter', | |
| 107 help='Run only pages whose URLs match the given filter regexp.') | |
|
nduca
2013/01/09 21:47:19
should we validate that the regex compiles down in
marja
2013/01/10 13:39:59
I added checks to _ShuffleAndFilterPageSet, since
| |
| 106 parser.add_option_group(group) | 108 parser.add_option_group(group) |
| 107 | 109 |
| 108 # Debugging options | 110 # Debugging options |
| 109 group = optparse.OptionGroup(parser, 'When things go wrong') | 111 group = optparse.OptionGroup(parser, 'When things go wrong') |
| 110 group.add_option( | 112 group.add_option( |
| 111 '--trace-dir', dest='trace_dir', default=None, | 113 '--trace-dir', dest='trace_dir', default=None, |
| 112 help='Record traces and store them in this directory.') | 114 help='Record traces and store them in this directory.') |
| 113 group.add_option( | 115 group.add_option( |
| 114 '-v', '--verbose', action='count', dest='verbosity', | 116 '-v', '--verbose', action='count', dest='verbosity', |
| 115 help='Increase verbosity level (repeat as needed)') | 117 help='Increase verbosity level (repeat as needed)') |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 147 self.extra_browser_args_as_string) # pylint: disable=E1101 | 149 self.extra_browser_args_as_string) # pylint: disable=E1101 |
| 148 self.extra_browser_args.extend(tmp) | 150 self.extra_browser_args.extend(tmp) |
| 149 delattr(self, 'extra_browser_args_as_string') | 151 delattr(self, 'extra_browser_args_as_string') |
| 150 return ret | 152 return ret |
| 151 parser.parse_args = ParseArgs | 153 parser.parse_args = ParseArgs |
| 152 return parser | 154 return parser |
| 153 | 155 |
| 154 def AppendExtraBrowserArg(self, arg): | 156 def AppendExtraBrowserArg(self, arg): |
| 155 if arg not in self.extra_browser_args: | 157 if arg not in self.extra_browser_args: |
| 156 self.extra_browser_args.append(arg) | 158 self.extra_browser_args.append(arg) |
| OLD | NEW |