| 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 | 95 |
| 96 def _wdiff_missing_message(self): | 96 def _wdiff_missing_message(self): |
| 97 return 'wdiff is not installed; please install from MacPorts or elsewher
e' | 97 return 'wdiff is not installed; please install from MacPorts or elsewher
e' |
| 98 | 98 |
| 99 def path_to_apache(self): | 99 def path_to_apache(self): |
| 100 return '/usr/sbin/httpd' | 100 return '/usr/sbin/httpd' |
| 101 | 101 |
| 102 def path_to_apache_config_file(self): | 102 def path_to_apache_config_file(self): |
| 103 config_file_name = 'apache2-httpd-' + self._apache_version() + '.conf' | 103 config_file_name = 'apache2-httpd-' + self._apache_version() + '.conf' |
| 104 return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', co
nfig_file_name) | 104 return self._filesystem.join(self.apache_config_directory(), config_file
_name) |
| 105 | 105 |
| 106 def _path_to_driver(self, target=None): | 106 def _path_to_driver(self, target=None): |
| 107 return self._build_path_with_target(target, self.driver_name() + '.app',
'Contents', 'MacOS', self.driver_name()) | 107 return self._build_path_with_target(target, self.driver_name() + '.app',
'Contents', 'MacOS', self.driver_name()) |
| 108 | 108 |
| 109 def _path_to_wdiff(self): | 109 def _path_to_wdiff(self): |
| 110 return 'wdiff' | 110 return 'wdiff' |
| OLD | NEW |