diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py index f638e01..5360ab3 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py @@ -105,11 +105,15 @@ class ChromiumMacPort(chromium.ChromiumPort): # def _build_path(self, *comps): + if self.get_option('build_directory'): + return self._filesystem.join(self.get_option('build_directory'), + *comps) + path = self.path_from_chromium_base('xcodebuild', *comps) - if os.path.exists(path) or self.get_option('use_test_shell'): + if self._filesystem.exists(path) or self.get_option('use_test_shell'): return path - return self.path_from_webkit_base('WebKit', 'chromium', 'xcodebuild', - *comps) + return self.path_from_webkit_base( + 'Source', 'WebKit', 'chromium', 'xcodebuild', *comps) def _check_wdiff_install(self): try: @@ -128,8 +132,8 @@ class ChromiumMacPort(chromium.ChromiumPort): return '/usr/sbin/httpd' def _path_to_apache_config_file(self): - return os.path.join(self.layout_tests_dir(), 'http', 'conf', - 'apache2-httpd.conf') + return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', + 'apache2-httpd.conf') def _path_to_lighttpd(self): return self._lighttpd_path('bin', 'lighttpd') |