| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 return 'wdiff is not installed; please install from MacPorts or elsewher
e' | 101 return 'wdiff is not installed; please install from MacPorts or elsewher
e' |
| 102 | 102 |
| 103 def path_to_apache(self): | 103 def path_to_apache(self): |
| 104 return '/usr/sbin/httpd' | 104 return '/usr/sbin/httpd' |
| 105 | 105 |
| 106 def path_to_apache_config_file(self): | 106 def path_to_apache_config_file(self): |
| 107 return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'a
pache2-httpd.conf') | 107 return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'a
pache2-httpd.conf') |
| 108 | 108 |
| 109 def _path_to_driver(self, configuration=None): | 109 def _path_to_driver(self, configuration=None): |
| 110 # FIXME: make |configuration| happy with case-sensitive file systems. | 110 # FIXME: make |configuration| happy with case-sensitive file systems. |
| 111 return self._build_path_with_configuration(configuration, self.driver_na
me() + '.app', 'Contents', 'MacOS', self.driver_name()) | 111 return self._build_path_with_configuration( |
| 112 configuration, self.driver_name() + '.app', 'Contents', 'MacOS', sel
f.driver_name()) |
| 112 | 113 |
| 113 def _path_to_helper(self): | 114 def _path_to_helper(self): |
| 114 binary_name = 'layout_test_helper' | 115 binary_name = 'layout_test_helper' |
| 115 return self._build_path(binary_name) | 116 return self._build_path(binary_name) |
| 116 | 117 |
| 117 def _path_to_wdiff(self): | 118 def _path_to_wdiff(self): |
| 118 return 'wdiff' | 119 return 'wdiff' |
| OLD | NEW |