| 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 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 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 """Chromium Mac implementation of the Port interface.""" | 29 """Chromium Mac implementation of the Port interface.""" |
| 30 | 30 |
| 31 import logging | 31 import logging |
| 32 import signal | |
| 33 | 32 |
| 34 from webkitpy.layout_tests.port import base | 33 from webkitpy.layout_tests.port import base |
| 35 | 34 |
| 36 | 35 |
| 37 _log = logging.getLogger(__name__) | 36 _log = logging.getLogger(__name__) |
| 38 | 37 |
| 39 | 38 |
| 40 class MacPort(base.Port): | 39 class MacPort(base.Port): |
| 41 SUPPORTED_VERSIONS = ('mac10.9', 'mac10.10', 'mac10.11', 'retina') | 40 SUPPORTED_VERSIONS = ('mac10.9', 'mac10.10', 'mac10.11', 'retina') |
| 42 port_name = 'mac' | 41 port_name = 'mac' |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 | 100 |
| 102 def path_to_apache_config_file(self): | 101 def path_to_apache_config_file(self): |
| 103 config_file_name = 'apache2-httpd-' + self._apache_version() + '.conf' | 102 config_file_name = 'apache2-httpd-' + self._apache_version() + '.conf' |
| 104 return self._filesystem.join(self.apache_config_directory(), config_file
_name) | 103 return self._filesystem.join(self.apache_config_directory(), config_file
_name) |
| 105 | 104 |
| 106 def _path_to_driver(self, target=None): | 105 def _path_to_driver(self, target=None): |
| 107 return self._build_path_with_target(target, self.driver_name() + '.app',
'Contents', 'MacOS', self.driver_name()) | 106 return self._build_path_with_target(target, self.driver_name() + '.app',
'Contents', 'MacOS', self.driver_name()) |
| 108 | 107 |
| 109 def _path_to_wdiff(self): | 108 def _path_to_wdiff(self): |
| 110 return 'wdiff' | 109 return 'wdiff' |
| OLD | NEW |