summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-07 17:17:25 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-07 17:17:25 +0000
commit01302da0fdaa58f16d470bd5be63e0060f3abbd2 (patch)
tree9518191fa88051ba75754d049a45daecd2faa5dc /webkit
parent843ef220cca4b62d3fce13b8df5ae3df52dfd33c (diff)
downloadchromium_src-01302da0fdaa58f16d470bd5be63e0060f3abbd2.zip
chromium_src-01302da0fdaa58f16d470bd5be63e0060f3abbd2.tar.gz
chromium_src-01302da0fdaa58f16d470bd5be63e0060f3abbd2.tar.bz2
Moving libraries and executables in the windows build to prepare for landing of mac/linux binaries in parallel locations
Review URL: http://codereview.chromium.org/5629 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/layout_package/http_server.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/layout_package/http_server.py
index 7d5d9ff..8c30d24 100644
--- a/webkit/tools/layout_tests/layout_package/http_server.py
+++ b/webkit/tools/layout_tests/layout_package/http_server.py
@@ -86,7 +86,7 @@ class Lighttpd:
' ".pl" => "/usr/bin/env",\n'
' ".asis" => "/usr/bin/cat",\n'
' ".php" => "%s" )\n\n') %
- PathFromBase('third_party', 'lighttpd', 'php5', 'php-cgi.exe'))
+ PathFromBase('third_party', 'lighttpd', 'win', 'php5', 'php-cgi.exe'))
# Setup log files
f.write(('server.errorlog = "%s"\n'
@@ -105,11 +105,11 @@ class Lighttpd:
'}\n\n') % (mapping['port'], mapping['docroot']))
f.close()
- start_cmd = [ PathFromBase('third_party', 'lighttpd', 'LightTPD.exe'),
+ start_cmd = [ PathFromBase('third_party', 'lighttpd', 'win', 'LightTPD.exe'),
# Newly written config file
'-f', PathFromBase(self._output_dir, 'lighttpd.conf'),
- # Where it can find it's module dynamic libraries
- '-m', PathFromBase('third_party', 'lighttpd', 'lib'),
+ # Where it can find its module dynamic libraries
+ '-m', PathFromBase('third_party', 'lighttpd', 'win', 'lib'),
# Don't background
'-D' ]