summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py')
-rw-r--r--chromium/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py23
1 files changed, 8 insertions, 15 deletions
diff --git a/chromium/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py b/chromium/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py
index d582210680f..8131a589199 100644
--- a/chromium/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py
+++ b/chromium/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py
@@ -50,6 +50,8 @@ class LinuxPort(base.Port):
DEFAULT_BUILD_DIRECTORIES = ('out',)
+ BUILD_REQUIREMENTS_URL = 'https://code.google.com/p/chromium/wiki/LinuxBuildInstructions'
+
@classmethod
def _determine_driver_path_statically(cls, host, options):
config_object = config.Config(host.executive, host.filesystem)
@@ -137,22 +139,13 @@ class LinuxPort(base.Port):
def operating_system(self):
return 'linux'
- def virtual_test_suites(self):
- result = super(LinuxPort, self).virtual_test_suites()
- result.extend([
- base.VirtualTestSuite('linux-subpixel',
- 'platform/linux/fast/text/subpixel',
- ['--enable-webkit-text-subpixel-positioning']),
- ])
- return result
-
#
# PROTECTED METHODS
#
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('')
@@ -171,7 +164,7 @@ class LinuxPort(base.Port):
def _wdiff_missing_message(self):
return 'wdiff is not installed; please install using "sudo apt-get install wdiff"'
- def _path_to_apache(self):
+ 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"]:
@@ -180,13 +173,13 @@ class LinuxPort(base.Port):
_log.error("Could not find apache. Not installed or unknown path.")
return None
- def _path_to_lighttpd(self):
+ def path_to_lighttpd(self):
return "/usr/sbin/lighttpd"
- def _path_to_lighttpd_modules(self):
+ def path_to_lighttpd_modules(self):
return "/usr/lib/lighttpd"
- def _path_to_lighttpd_php(self):
+ def path_to_lighttpd_php(self):
return "/usr/bin/php-cgi"
def _path_to_driver(self, configuration=None):