summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 02:53:33 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 02:53:33 +0000
commit25e65ec8c39b3ba0a420f60d6c5c6021ef317b56 (patch)
treebcebf58e3d26e31e8928acc23752f890f00e341a
parent1d94f270d51ac0e7eddbaea03fe61d2a7b289f87 (diff)
downloadchromium_src-25e65ec8c39b3ba0a420f60d6c5c6021ef317b56.zip
chromium_src-25e65ec8c39b3ba0a420f60d6c5c6021ef317b56.tar.gz
chromium_src-25e65ec8c39b3ba0a420f60d6c5c6021ef317b56.tar.bz2
Fix path to lighttpd.conf
BUG=none TBR=pam@chromium.org TEST=none Review URL: http://codereview.chromium.org/549128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36841 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xwebkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py
index 6c279d6..d3be222 100755
--- a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py
+++ b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/http_server.py
@@ -82,7 +82,8 @@ class Lighttpd(http_server_base.HttpServerBase):
raise 'Lighttpd already running'
base_conf_file = path_utils.PathFromBase('webkit',
- 'tools', 'layout_tests', 'layout_package', 'lighttpd.conf')
+ 'tools', 'layout_tests', 'webkitpy', 'layout_tests',
+ 'layout_package', 'lighttpd.conf')
out_conf_file = os.path.join(self._output_dir, 'lighttpd.conf')
time_str = time.strftime("%d%b%Y-%H%M%S")
access_file_name = "access.log-" + time_str + ".txt"