| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 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 import glob | 6 import glob |
| 7 import optparse | 7 import optparse |
| 8 import os.path | 8 import os.path |
| 9 import socket | 9 import socket |
| 10 import sys | 10 import sys |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 'server to be made visible under the root.') | 49 'server to be made visible under the root.') |
| 50 parser.add_option('--test_arg', dest='test_args', action='append', | 50 parser.add_option('--test_arg', dest='test_args', action='append', |
| 51 type='string', nargs=2, default=[], | 51 type='string', nargs=2, default=[], |
| 52 metavar='KEY VALUE', | 52 metavar='KEY VALUE', |
| 53 help='Parameterize the test with a key/value pair.') | 53 help='Parameterize the test with a key/value pair.') |
| 54 parser.add_option('--redirect_url', dest='map_redirects', action='append', | 54 parser.add_option('--redirect_url', dest='map_redirects', action='append', |
| 55 type='string', nargs=2, default=[], | 55 type='string', nargs=2, default=[], |
| 56 metavar='DEST SRC', | 56 metavar='DEST SRC', |
| 57 help='Add a redirect to the HTTP server, ' | 57 help='Add a redirect to the HTTP server, ' |
| 58 'requests for SRC will result in a redirect (302) to DEST.') | 58 'requests for SRC will result in a redirect (302) to DEST.') |
| 59 parser.add_option('--prefer_portable_in_manifest', | |
| 60 dest='prefer_portable_in_manifest', | |
| 61 action='store_true', default=False, | |
| 62 help='Use portable programs in manifest if available.') | |
| 63 parser.add_option('-f', '--file', dest='files', action='append', | 59 parser.add_option('-f', '--file', dest='files', action='append', |
| 64 type='string', default=[], | 60 type='string', default=[], |
| 65 metavar='FILENAME', | 61 metavar='FILENAME', |
| 66 help='Add a file to serve from the HTTP server, to be ' | 62 help='Add a file to serve from the HTTP server, to be ' |
| 67 'made visible in the root directory. ' | 63 'made visible in the root directory. ' |
| 68 '"--file path/to/foo.html" is equivalent to ' | 64 '"--file path/to/foo.html" is equivalent to ' |
| 69 '"--map_file foo.html path/to/foo.html"') | 65 '"--map_file foo.html path/to/foo.html"') |
| 70 parser.add_option('--mime_type', dest='mime_types', action='append', | 66 parser.add_option('--mime_type', dest='mime_types', action='append', |
| 71 type='string', nargs=2, default=[], metavar='DEST SRC', | 67 type='string', nargs=2, default=[], metavar='DEST SRC', |
| 72 help='Map file extension SRC to MIME type DEST when ' | 68 help='Map file extension SRC to MIME type DEST when ' |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 # Validate the URL | 360 # Validate the URL |
| 365 url = options.url | 361 url = options.url |
| 366 if url is None: | 362 if url is None: |
| 367 parser.error('Must specify a URL') | 363 parser.error('Must specify a URL') |
| 368 | 364 |
| 369 return Run(url, options) | 365 return Run(url, options) |
| 370 | 366 |
| 371 | 367 |
| 372 if __name__ == '__main__': | 368 if __name__ == '__main__': |
| 373 sys.exit(RunFromCommandLine()) | 369 sys.exit(RunFromCommandLine()) |
| OLD | NEW |