diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py index d080f82..14f2777 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py @@ -30,7 +30,6 @@ """Chromium Win implementation of the Port interface.""" import logging -import os import sys import chromium @@ -106,14 +105,17 @@ class ChromiumWinPort(chromium.ChromiumPort): # PROTECTED ROUTINES # def _build_path(self, *comps): + if self.get_option('build_directory'): + return self._filesystem.join(self.get_option('build_directory'), + *comps) + p = self.path_from_chromium_base('webkit', *comps) - if os.path.exists(p): + if self._filesystem.exists(p): return p p = self.path_from_chromium_base('chrome', *comps) - if os.path.exists(p) or self.get_option('use_test_shell'): + if self._filesystem.exists(p) or self.get_option('use_test_shell'): return p - return os.path.join(self.path_from_webkit_base(), 'WebKit', 'chromium', - *comps) + return self._filesystem.join(self.path_from_webkit_base(), 'WebKit', 'chromium', *comps) def _lighttpd_path(self, *comps): return self.path_from_chromium_base('third_party', 'lighttpd', 'win', @@ -124,8 +126,7 @@ class ChromiumWinPort(chromium.ChromiumPort): 'sbin', 'httpd') def _path_to_apache_config_file(self): - return os.path.join(self.layout_tests_dir(), 'http', 'conf', - 'cygwin-httpd.conf') + return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'cygwin-httpd.conf') def _path_to_lighttpd(self): return self._lighttpd_path('LightTPD.exe') |