diff options
| author | Steve Block <steveblock@google.com> | 2010-08-26 15:27:24 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-08-26 16:57:17 +0100 |
| commit | 9d660cb5f3202366ad8540d66018b33b3f8578df (patch) | |
| tree | 6664c067d46d2dd6a882444a41e718885e5e28c7 /tests | |
| parent | ee273fac7f223eafb7619168ec656dd4947b1e5e (diff) | |
| download | frameworks_base-9d660cb5f3202366ad8540d66018b33b3f8578df.zip frameworks_base-9d660cb5f3202366ad8540d66018b33b3f8578df.tar.gz frameworks_base-9d660cb5f3202366ad8540d66018b33b3f8578df.tar.bz2 | |
Update run_apach2.py to serve HTTP tests at server root
The complete set of layout tests is still available at /LayoutTests
and scripts at /WebKitTools/DumpRenderTree/android.
Note that this requires a corresponding change to
external/webkit/WebKitTools/DumpRenderTree/android/get_layout_tests_dir_contents.php
Bug: 2951727
Change-Id: Idf366942ffd5786759c989e992359b7e7dbb182c
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/DumpRenderTree2/assets/run_apache2.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/DumpRenderTree2/assets/run_apache2.py b/tests/DumpRenderTree2/assets/run_apache2.py index bbb007c..5764f0e 100755 --- a/tests/DumpRenderTree2/assets/run_apache2.py +++ b/tests/DumpRenderTree2/assets/run_apache2.py @@ -55,7 +55,8 @@ def main(): # Paths relative to android_tree_root webkit_path = os.path.join("external", "webkit") - http_conf_path = os.path.join(webkit_path, "LayoutTests", "http", "conf") + layout_tests_path = os.path.join(webkit_path, "LayoutTests") + http_conf_path = os.path.join(layout_tests_path, "http", "conf") # Prepare the command to set ${APACHE_RUN_USER} and ${APACHE_RUN_GROUP} envvars_path = os.path.join("/etc", "apache2", "envvars") @@ -67,7 +68,14 @@ def main(): # Prepare the command to (re)start/stop the server with specified settings apache2_restart_cmd = "apache2 -k " + run_cmd directives = " -c \"ServerRoot " + android_tree_root + "\"" - directives += " -c \"DocumentRoot " + webkit_path + "\"" + + # We use http/tests as the document root as the HTTP tests use hardcoded + # resources at the server root. We then use aliases to make available the + # complete set of tests and the required scripts. + directives += " -c \"DocumentRoot " + os.path.join(layout_tests_path, "http", "tests/") + "\"" + directives += " -c \"Alias /LayoutTests " + layout_tests_path + "\"" + directives += " -c \"Alias /WebKitTools/DumpRenderTree/android " + \ + os.path.join(webkit_path, "WebKitTools", "DumpRenderTree", "android") + "\"" # This directive is commented out in apache2-debian-httpd.conf for some reason # However, it is useful to browse through tests in the browser, so it's added here. |