diff options
| -rwxr-xr-x | build/install-build-deps.sh | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/http_server.py | 5 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/platform_utils_linux.py | 21 |
3 files changed, 22 insertions, 6 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index f095217..828218f 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -29,7 +29,7 @@ download_deb() { install_hardy() { sudo apt-get install subversion pkg-config python perl g++ g++-multilib \ bison flex gperf libnss3-dev libglib2.0-dev libgtk2.0-dev \ - libnspr4-0d libnspr4-dev wdiff + libnspr4-0d libnspr4-dev wdiff lighttpd php5-cgi wget -c http://www.trevp.com/tlslite/tlslite-0.3.8.tar.gz tar xvfz tlslite-0.3.8.tar.gz diff --git a/webkit/tools/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/layout_package/http_server.py index 0369f81..c8ca8675 100644 --- a/webkit/tools/layout_tests/layout_package/http_server.py +++ b/webkit/tools/layout_tests/layout_package/http_server.py @@ -127,8 +127,9 @@ class Lighttpd: # Put the cygwin directory first in the path to find cygwin1.dll env = os.environ - env['PATH'] = '%s;%s' % ( - PathFromBase('third_party', 'cygwin', 'bin'), env['PATH']) + if sys.platform in ('cygwin', 'win32'): + env['PATH'] = '%s;%s' % ( + PathFromBase('third_party', 'cygwin', 'bin'), env['PATH']) logging.info('Starting http server') self._process = subprocess.Popen(start_cmd, env=env) 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 ca5308e..b69e642 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 using "sudo apt-get install lighttpd php5cgi"' + 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 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 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. |