commit 5846d4561d45c2805b3cba33995bfa08b55b980e
author Maksymilian Osowski <maxosowski@google.com> Thu Sep 02 20:19:29 2010 +0100
committer Maksymilian Osowski <maxosowski@google.com> Fri Sep 03 17:03:33 2010 +0100
tree 8df6d9dd68505d49fc1e8d2b20369ac469db8f1f
parent fddedbf999a57220ed89bbebe9f35e093aa77c2d

Fixed the run_apache2.py script to use the correct mime.types file.

Change-Id: I0bd5870259b3f7de92d4996d1ebb83fdff126210

tests/DumpRenderTree2/assets/run_apache2.py

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 @@
     "\""
   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")