| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| 11 # in the documentation and/or other materials provided with the | 11 # in the documentation and/or other materials provided with the |
| 12 # distribution. | 12 # distribution. |
| 13 # * Neither the name of Google Inc. nor the names of its | 13 # * Neither the name of Google Inc. nor the names of its |
| 14 # contributors may be used to endorse or promote products derived from | 14 # contributors may be used to endorse or promote products derived from |
| 15 # this software without specific prior written permission. | 15 # this software without specific prior written permission. |
| 16 # | 16 # |
| 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 17 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 18 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 19 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 20 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 21 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 22 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | 28 |
| 29 """A utility script for starting and stopping servers as they are used in the la
yout tests.""" | 29 """A utility module for making standalone scripts to start servers. |
| 30 |
| 31 Scripts in Tools/Scripts can use this module to start servers that |
| 32 are normally used for layout tests, outside of the layout test runner. |
| 33 """ |
| 30 | 34 |
| 31 import logging | 35 import logging |
| 32 import optparse | 36 import argparse |
| 33 | 37 |
| 34 from webkitpy.common.host import Host | 38 from webkitpy.common.host import Host |
| 35 | 39 |
| 36 _log = logging.getLogger(__name__) | 40 _log = logging.getLogger(__name__) |
| 37 | 41 |
| 38 | 42 |
| 39 def main(server_constructor, input_fn=None, argv=None, **kwargs): | 43 def main(server_constructor, input_fn=None, argv=None, **kwargs): |
| 40 input_fn = input_fn or raw_input | 44 input_fn = input_fn or raw_input |
| 41 | 45 |
| 42 option_parser = optparse.OptionParser() | 46 parser = argparse.ArgumentParser() |
| 43 option_parser.add_option('--output-dir', dest='output_dir', | 47 parser.add_argument('--output-dir', type=str, default=None, |
| 44 default=None, help='output directory.') | 48 help='output directory, for log files etc.') |
| 45 option_parser.add_option('-v', '--verbose', action='store_true') | 49 parser.add_argument('-v', '--verbose', action='store_true', |
| 46 options, args = option_parser.parse_args(argv) | 50 help='print more information, including port numbers') |
| 51 args = parser.parse_args(argv) |
| 47 | 52 |
| 48 logging.basicConfig() | 53 logging.basicConfig() |
| 49 logger = logging.getLogger() | 54 logger = logging.getLogger() |
| 50 logger.setLevel(logging.DEBUG if options.verbose else logging.INFO) | 55 logger.setLevel(logging.DEBUG if args.verbose else logging.INFO) |
| 51 | 56 |
| 52 host = Host() | 57 host = Host() |
| 53 port_obj = host.port_factory.get() | 58 port_obj = host.port_factory.get() |
| 54 if not options.output_dir: | 59 if not args.output_dir: |
| 55 options.output_dir = port_obj.default_results_directory() | 60 args.output_dir = port_obj.default_results_directory() |
| 56 | 61 |
| 57 # Create the output directory if it doesn't already exist. | 62 # Create the output directory if it doesn't already exist. |
| 58 port_obj.host.filesystem.maybe_make_directory(options.output_dir) | 63 port_obj.host.filesystem.maybe_make_directory(args.output_dir) |
| 59 | 64 |
| 60 server = server_constructor(port_obj, options.output_dir, **kwargs) | 65 server = server_constructor(port_obj, args.output_dir, **kwargs) |
| 61 server.start() | 66 server.start() |
| 62 try: | 67 try: |
| 63 _ = input_fn('Hit any key to stop the server and exit.') | 68 _ = input_fn('Hit any key to stop the server and exit.') |
| 64 except (KeyboardInterrupt, EOFError) as e: | 69 except (KeyboardInterrupt, EOFError) as e: |
| 65 pass | 70 pass |
| 66 | 71 |
| 67 server.stop() | 72 server.stop() |
| OLD | NEW |