| Index: Tools/Scripts/webkitpy/layout_tests/port/linux.py
|
| diff --git a/Tools/Scripts/webkitpy/layout_tests/port/linux.py b/Tools/Scripts/webkitpy/layout_tests/port/linux.py
|
| index 9d53319dd538b454e1eb3ed5c965220edc6fd7bc..d5ae4a5a1d916f3d6c924043565ce6691f5a4c06 100644
|
| --- a/Tools/Scripts/webkitpy/layout_tests/port/linux.py
|
| +++ b/Tools/Scripts/webkitpy/layout_tests/port/linux.py
|
| @@ -45,7 +45,7 @@ class LinuxPort(base.Port):
|
|
|
| SUPPORTED_VERSIONS = ('x86', 'x86_64')
|
|
|
| - FALLBACK_PATHS = { 'x86_64': [ 'linux' ] + win.WinPort.latest_platform_fallback_path() }
|
| + FALLBACK_PATHS = {'x86_64': ['linux'] + win.WinPort.latest_platform_fallback_path()}
|
| FALLBACK_PATHS['x86'] = ['linux-x86'] + FALLBACK_PATHS['x86_64']
|
|
|
| DEFAULT_BUILD_DIRECTORIES = ('out',)
|
| @@ -91,7 +91,8 @@ class LinuxPort(base.Port):
|
| @classmethod
|
| def determine_full_port_name(cls, host, options, port_name):
|
| if port_name.endswith('linux'):
|
| - return port_name + '-' + cls._determine_architecture(host.filesystem, host.executive, cls._determine_driver_path_statically(host, options))
|
| + return port_name + '-' + \
|
| + cls._determine_architecture(host.filesystem, host.executive, cls._determine_driver_path_statically(host, options))
|
| return port_name
|
|
|
| def __init__(self, host, port_name, **kwargs):
|
| @@ -144,8 +145,8 @@ class LinuxPort(base.Port):
|
| #
|
|
|
| def _check_apache_install(self):
|
| - result = self._check_file_exists(self.path_to_apache(), "apache2")
|
| - result = self._check_file_exists(self.path_to_apache_config_file(), "apache2 config file") and result
|
| + result = self._check_file_exists(self.path_to_apache(), 'apache2')
|
| + 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 apache2 libapache2-mod-php5"')
|
| _log.error('')
|
| @@ -157,10 +158,10 @@ class LinuxPort(base.Port):
|
| def path_to_apache(self):
|
| # The Apache binary path can vary depending on OS and distribution
|
| # See http://wiki.apache.org/httpd/DistrosDefaultLayout
|
| - for path in ["/usr/sbin/httpd", "/usr/sbin/apache2"]:
|
| + for path in ['/usr/sbin/httpd', '/usr/sbin/apache2']:
|
| if self._filesystem.exists(path):
|
| return path
|
| - _log.error("Could not find apache. Not installed or unknown path.")
|
| + _log.error('Could not find apache. Not installed or unknown path.')
|
| return None
|
|
|
| def _path_to_driver(self, configuration=None):
|
|
|