| OLD | NEW |
| 1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 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 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 import time | 32 import time |
| 33 | 33 |
| 34 from webkitpy.layout_tests.servers import server_base | 34 from webkitpy.layout_tests.servers import server_base |
| 35 | 35 |
| 36 | 36 |
| 37 _log = logging.getLogger(__name__) | 37 _log = logging.getLogger(__name__) |
| 38 | 38 |
| 39 | 39 |
| 40 class Lighttpd(server_base.ServerBase): | 40 class Lighttpd(server_base.ServerBase): |
| 41 | 41 |
| 42 def __init__(self, port_obj, output_dir, additional_dirs=None): | 42 def __init__(self, port_obj, output_dir): |
| 43 super(Lighttpd, self).__init__(port_obj, output_dir) | 43 super(Lighttpd, self).__init__(port_obj, output_dir) |
| 44 self._name = 'lighttpd' | 44 self._name = 'lighttpd' |
| 45 self._log_prefixes = ('access.log-', 'error.log-') | 45 self._log_prefixes = ('access.log-', 'error.log-') |
| 46 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) | 46 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) |
| 47 | 47 |
| 48 self._layout_tests_dir = self._port_obj.layout_tests_dir() | 48 self._layout_tests_dir = self._port_obj.layout_tests_dir() |
| 49 | 49 |
| 50 self._webkit_tests = self._filesystem.join(self._layout_tests_dir, 'http
', 'tests') | 50 self._webkit_tests = self._filesystem.join(self._layout_tests_dir, 'http
', 'tests') |
| 51 self._js_test_resource = self._filesystem.join(self._layout_tests_dir, '
resources') | 51 self._js_test_resource = self._filesystem.join(self._layout_tests_dir, '
resources') |
| 52 self._media_resource = self._filesystem.join(self._layout_tests_dir, 'me
dia') | 52 self._media_resource = self._filesystem.join(self._layout_tests_dir, 'me
dia') |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 122 |
| 123 # Copy liblightcomp.dylib to /tmp/lighttpd/lib to work around the | 123 # Copy liblightcomp.dylib to /tmp/lighttpd/lib to work around the |
| 124 # bug that mod_alias.so loads it from the hard coded path. | 124 # bug that mod_alias.so loads it from the hard coded path. |
| 125 if self._port_obj.host.platform.is_mac(): | 125 if self._port_obj.host.platform.is_mac(): |
| 126 tmp_module_path = '/tmp/lighttpd/lib' | 126 tmp_module_path = '/tmp/lighttpd/lib' |
| 127 if not self._filesystem.exists(tmp_module_path): | 127 if not self._filesystem.exists(tmp_module_path): |
| 128 self._filesystem.maybe_make_directory(tmp_module_path) | 128 self._filesystem.maybe_make_directory(tmp_module_path) |
| 129 lib_file = 'liblightcomp.dylib' | 129 lib_file = 'liblightcomp.dylib' |
| 130 self._filesystem.copyfile(self._filesystem.join(self._port_obj.path_
to_lighttpd_modules(), lib_file), | 130 self._filesystem.copyfile(self._filesystem.join(self._port_obj.path_
to_lighttpd_modules(), lib_file), |
| 131 self._filesystem.join(tmp_module_path, lib
_file)) | 131 self._filesystem.join(tmp_module_path, lib
_file)) |
| OLD | NEW |