summaryrefslogtreecommitdiffstats
path: root/tests/DumpRenderTree2
diff options
context:
space:
mode:
authorMaksymilian Osowski <maxosowski@google.com>2010-09-02 20:19:29 +0100
committerMaksymilian Osowski <maxosowski@google.com>2010-09-03 17:03:33 +0100
commit5846d4561d45c2805b3cba33995bfa08b55b980e (patch)
tree8df6d9dd68505d49fc1e8d2b20369ac469db8f1f /tests/DumpRenderTree2
parentfddedbf999a57220ed89bbebe9f35e093aa77c2d (diff)
downloadframeworks_base-5846d4561d45c2805b3cba33995bfa08b55b980e.zip
frameworks_base-5846d4561d45c2805b3cba33995bfa08b55b980e.tar.gz
frameworks_base-5846d4561d45c2805b3cba33995bfa08b55b980e.tar.bz2
Fixed the run_apache2.py script to use the correct mime.types file.
Change-Id: I0bd5870259b3f7de92d4996d1ebb83fdff126210
Diffstat (limited to 'tests/DumpRenderTree2')
-rwxr-xr-xtests/DumpRenderTree2/assets/run_apache2.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/DumpRenderTree2/assets/run_apache2.py b/tests/DumpRenderTree2/assets/run_apache2.py
index e0e4be7..74ab850 100755
--- a/tests/DumpRenderTree2/assets/run_apache2.py
+++ b/tests/DumpRenderTree2/assets/run_apache2.py
@@ -92,7 +92,8 @@ def main():
"\""
directives += " -c \"User ${APACHE_RUN_USER}\""
directives += " -c \"Group ${APACHE_RUN_GROUP}\""
- directives += " -C \"TypesConfig " + os.path.join("/etc", "mime.types") + "\""
+ directives += " -C \"TypesConfig " + \
+ os.path.join(android_tree_root, http_conf_path, "mime.types") + "\""
conf_file_cmd = " -f " + \
os.path.join(android_tree_root, http_conf_path, "apache2-debian-httpd.conf")