| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 # | 94 # |
| 95 # PROTECTED METHODS | 95 # PROTECTED METHODS |
| 96 # | 96 # |
| 97 | 97 |
| 98 def _lighttpd_path(self, *comps): | 98 def _lighttpd_path(self, *comps): |
| 99 return self.path_from_chromium_base('third_party', 'lighttpd', 'mac', *c
omps) | 99 return self.path_from_chromium_base('third_party', 'lighttpd', 'mac', *c
omps) |
| 100 | 100 |
| 101 def _wdiff_missing_message(self): | 101 def _wdiff_missing_message(self): |
| 102 return 'wdiff is not installed; please install from MacPorts or elsewher
e' | 102 return 'wdiff is not installed; please install from MacPorts or elsewher
e' |
| 103 | 103 |
| 104 def _path_to_apache(self): | 104 def path_to_apache(self): |
| 105 return '/usr/sbin/httpd' | 105 return '/usr/sbin/httpd' |
| 106 | 106 |
| 107 def _path_to_apache_config_file(self): | 107 def path_to_apache_config_file(self): |
| 108 return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'a
pache2-httpd.conf') | 108 return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'a
pache2-httpd.conf') |
| 109 | 109 |
| 110 def _path_to_lighttpd(self): | 110 def path_to_lighttpd(self): |
| 111 return self._lighttpd_path('bin', 'lighttpd') | 111 return self._lighttpd_path('bin', 'lighttpd') |
| 112 | 112 |
| 113 def _path_to_lighttpd_modules(self): | 113 def path_to_lighttpd_modules(self): |
| 114 return self._lighttpd_path('lib') | 114 return self._lighttpd_path('lib') |
| 115 | 115 |
| 116 def _path_to_lighttpd_php(self): | 116 def path_to_lighttpd_php(self): |
| 117 return self._lighttpd_path('bin', 'php-cgi') | 117 return self._lighttpd_path('bin', 'php-cgi') |
| 118 | 118 |
| 119 def _path_to_driver(self, configuration=None): | 119 def _path_to_driver(self, configuration=None): |
| 120 # FIXME: make |configuration| happy with case-sensitive file systems. | 120 # FIXME: make |configuration| happy with case-sensitive file systems. |
| 121 return self._build_path_with_configuration(configuration, self.driver_na
me() + '.app', 'Contents', 'MacOS', self.driver_name()) | 121 return self._build_path_with_configuration(configuration, self.driver_na
me() + '.app', 'Contents', 'MacOS', self.driver_name()) |
| 122 | 122 |
| 123 def _path_to_helper(self): | 123 def _path_to_helper(self): |
| 124 binary_name = 'layout_test_helper' | 124 binary_name = 'layout_test_helper' |
| 125 return self._build_path(binary_name) | 125 return self._build_path(binary_name) |
| 126 | 126 |
| 127 def _path_to_wdiff(self): | 127 def _path_to_wdiff(self): |
| 128 return 'wdiff' | 128 return 'wdiff' |
| OLD | NEW |