Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: webkit/tools/layout_tests/layout_package/platform_utils_linux.py

Issue 10653: Add Linux lighttpd for running LayoutTests on Linux. (Closed)
Patch Set: Added friendly error-message Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/layout_tests/layout_package/http_server.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/layout_tests/layout_package/platform_utils_linux.py
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
index ca5308e6bb7d2a94e4784c54983a2ea2568d8583..f6e0531dec2ada419a5d7734d80dc798b7bac4de 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
@@ -93,15 +93,30 @@ class PlatformUtility(object):
def LigHTTPdExecutablePath(self):
"""Returns the executable path to start LigHTTPd"""
- return PathFromBase('third_party', 'lighttpd', 'linux', 'bin', 'lighttpd')
+ binpath = "/usr/sbin/lighttpd"
+ if os.path.exists(binpath):
+ return binpath
+ print "Unable to find LigHTTPd executable %s" % binpath
+ print 'Please install lighttpd/php using "sudo apt-get install lighttpd php5cgi"'
tony 2008/11/18 20:49:25 Nit: 80 col (see two others below).
+ sys.exit(1)
def LigHTTPdModulePath(self):
"""Returns the library module path for LigHTTPd"""
- return PathFromBase('third_party', 'lighttpd', 'linux', 'lib')
+ modpath = "/usr/lib/lighttpd"
+ if os.path.exists(modpath):
+ return modpath
+ print "Unable to find LigHTTPd modules %s" % modpath
+ print 'Please install lighttpd/php using "sudo apt-get install lighttpd php5cgi"'
+ sys.exit(1)
def LigHTTPdPHPPath(self):
"""Returns the PHP executable path for LigHTTPd"""
- return PathFromBase('third_party', 'lighttpd', 'linux', 'bin', 'php-cgi')
+ binpath = "/usr/bin/php-cgi"
+ if os.path.exists(binpath):
+ return binpath
+ print "Unable to find PHP CGI executable %s" % binpath
+ print 'Please install lighttpd/php using "sudo apt-get install lighttpd php5cgi"'
+ sys.exit(1)
def ShutDownHTTPServer(self, server_process):
"""Shut down the lighttpd web server. Blocks until it's fully shut down.
« no previous file with comments | « webkit/tools/layout_tests/layout_package/http_server.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698