diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py index 5d9dd87..c1c85f8 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py @@ -78,20 +78,24 @@ class ChromiumLinuxPort(chromium.ChromiumPort): # def _build_path(self, *comps): + if self.get_option('build_directory'): + return self._filesystem.join(self.get_option('build_directory'), + *comps) + base = self.path_from_chromium_base() - if os.path.exists(os.path.join(base, 'sconsbuild')): - return os.path.join(base, 'sconsbuild', *comps) - if os.path.exists(os.path.join(base, 'out', *comps)) or self.get_option('use_test_shell'): - return os.path.join(base, 'out', *comps) + if self._filesystem.exists(self._filesystem.join(base, 'sconsbuild')): + return self._filesystem.join(base, 'sconsbuild', *comps) + if self._filesystem.exists(self._filesystem.join(base, 'out', *comps)) or self.get_option('use_test_shell'): + return self._filesystem.join(base, 'out', *comps) base = self.path_from_webkit_base() - if os.path.exists(os.path.join(base, 'sconsbuild')): - return os.path.join(base, 'sconsbuild', *comps) - return os.path.join(base, 'out', *comps) + if self._filesystem.exists(self._filesystem.join(base, 'sconsbuild')): + return self._filesystem.join(base, 'sconsbuild', *comps) + return self._filesystem.join(base, 'out', *comps) def _check_apache_install(self): - result = chromium.check_file_exists(self._path_to_apache(), + result = self._check_file_exists(self._path_to_apache(), "apache2") - result = chromium.check_file_exists(self._path_to_apache_config_file(), + result = self._check_file_exists(self._path_to_apache_config_file(), "apache2 config file") and result if not result: _log.error(' Please install using: "sudo apt-get install ' @@ -100,11 +104,11 @@ class ChromiumLinuxPort(chromium.ChromiumPort): return result def _check_lighttpd_install(self): - result = chromium.check_file_exists( + result = self._check_file_exists( self._path_to_lighttpd(), "LigHTTPd executable") - result = chromium.check_file_exists(self._path_to_lighttpd_php(), + result = self._check_file_exists(self._path_to_lighttpd_php(), "PHP CGI executable") and result - result = chromium.check_file_exists(self._path_to_lighttpd_modules(), + result = self._check_file_exists(self._path_to_lighttpd_modules(), "LigHTTPd modules") and result if not result: _log.error(' Please install using: "sudo apt-get install ' @@ -113,7 +117,7 @@ class ChromiumLinuxPort(chromium.ChromiumPort): return result def _check_wdiff_install(self): - result = chromium.check_file_exists(self._path_to_wdiff(), 'wdiff') + result = self._check_file_exists(self._path_to_wdiff(), 'wdiff') if not result: _log.error(' Please install using: "sudo apt-get install ' 'wdiff"') @@ -133,7 +137,7 @@ class ChromiumLinuxPort(chromium.ChromiumPort): else: config_name = 'apache2-debian-httpd.conf' - return os.path.join(self.layout_tests_dir(), 'http', 'conf', + return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', config_name) def _path_to_lighttpd(self): @@ -163,7 +167,7 @@ class ChromiumLinuxPort(chromium.ChromiumPort): return '/usr/bin/wdiff' def _is_redhat_based(self): - return os.path.exists(os.path.join('/etc', 'redhat-release')) + return self._filesystem.exists(self._filesystem.join('/etc', 'redhat-release')) def _shut_down_http_server(self, server_pid): """Shut down the lighttpd web server. Blocks until it's fully |