diff options
| author | Maksymilian Osowski <maxosowski@google.com> | 2010-08-26 08:01:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-26 08:01:58 -0700 |
| commit | da9f91a107c34ec0574724a5a0b71b0fa33b394a (patch) | |
| tree | 69e8e73be1fa1a9d9807a902b725518516d48991 /tests | |
| parent | 3eeb774c9f6b57689aed8d38df1c249f3bd4e117 (diff) | |
| parent | fe33f987cb61d8a5c22f207df6d47d2346828af7 (diff) | |
| download | frameworks_base-da9f91a107c34ec0574724a5a0b71b0fa33b394a.zip frameworks_base-da9f91a107c34ec0574724a5a0b71b0fa33b394a.tar.gz frameworks_base-da9f91a107c34ec0574724a5a0b71b0fa33b394a.tar.bz2 | |
Merge "Updated the script to include access log."
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/DumpRenderTree2/assets/run_apache2.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/DumpRenderTree2/assets/run_apache2.py b/tests/DumpRenderTree2/assets/run_apache2.py index f404090..7c78fac 100755 --- a/tests/DumpRenderTree2/assets/run_apache2.py +++ b/tests/DumpRenderTree2/assets/run_apache2.py @@ -58,6 +58,7 @@ def main(): export_envvars_cmd = "source " + envvars_path error_log_path = os.path.join(tmp_WebKit, "apache2-error.log") + custom_log_path = os.path.join(tmp_WebKit, "apache2-access.log") #Prepare the command to (re)start/stop the server with specified settings apache2_restart_cmd = "apache2 -k " + run_cmd @@ -72,6 +73,7 @@ def main(): directives += " -c \"LoadModule autoindex_module /usr/lib/apache2/modules/mod_autoindex.so\"" directives += " -c \"ErrorLog " + error_log_path +"\"" + directives += " -c \"CustomLog " + custom_log_path + " combined\"" directives += " -c \"SSLCertificateFile " + os.path.join ("external", "webkit", "LayoutTests", "http", "conf", "webkit-httpd.pem") + "\"" directives += " -c \"User ${APACHE_RUN_USER}\"" |