2 files changed, 186 insertions, 0 deletions
diff --git a/tests/DumpRenderTree2/assets/run_apache2.py b/tests/DumpRenderTree2/assets/run_apache2.py
new file mode 100755
index 0000000..5764f0e
--- /dev/null
+++ b/tests/DumpRenderTree2/assets/run_apache2.py
@@ -0,0 +1,121 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""Start, stop, or restart apache2 server.
+
+  Apache2 must be installed with mod_php!
+
+  Usage:
+    run_apache2.py start|stop|restart
+"""
+
+import sys
+import os
+import subprocess
+import logging
+
+def main():
+  if len(sys.argv) < 2:
+    run_cmd = ""
+  else:
+    run_cmd = sys.argv[1]
+
+  # Setup logging class
+  logging.basicConfig(level=logging.INFO, format='%(message)s')
+
+  if not run_cmd in ("start", "stop", "restart"):
+    logging.info("illegal argument: " + run_cmd)
+    logging.info("Usage: python run_apache2.py start|stop|restart")
+    return
+
+  # Create /tmp/WebKit if it doesn't exist. This is needed for various files used by apache2
+  tmp_WebKit = os.path.join("/tmp", "WebKit")
+  if not os.path.exists(tmp_WebKit):
+    os.mkdir(tmp_WebKit)
+
+  # Get the path to android tree root based on the script location.
+  # Basically we go 5 levels up
+  parent = os.pardir
+  script_location = os.path.abspath(os.path.dirname(sys.argv[0]))
+  android_tree_root = os.path.join(script_location, parent, parent, parent, parent, parent)
+  android_tree_root = os.path.normpath(android_tree_root)
+
+  # Paths relative to android_tree_root
+  webkit_path = os.path.join("external", "webkit")
+  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")
+  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
+  directives  = " -c \"ServerRoot " + android_tree_root + "\""
+
+  # 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.
+  # One thing to note is that because of problems with mod_dir and port numbers, mod_dir
+  # is turned off. That means that there _must_ be a trailing slash at the end of URL
+  # for auto indexes to work correctly.
+  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(http_conf_path, "webkit-httpd.pem") + \
+    "\""
+  directives += " -c \"User ${APACHE_RUN_USER}\""
+  directives += " -c \"Group ${APACHE_RUN_GROUP}\""
+  directives += " -C \"TypesConfig " + os.path.join("/etc", "mime.types") + "\""
+  conf_file_cmd = " -f " + \
+    os.path.join(android_tree_root, http_conf_path, "apache2-debian-httpd.conf")
+
+  # Try to execute the commands
+  logging.info("Will " + run_cmd + " apache2 server.")
+  cmd = export_envvars_cmd + " && " + apache2_restart_cmd + directives + conf_file_cmd
+  p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  (out, err) = p.communicate()
+
+  # Output the stdout from the command to console
+  logging.info(out)
+
+  # Report any errors
+  if p.returncode != 0:
+    logging.info("!! ERRORS:")
+
+    if err.find(envvars_path) != -1:
+      logging.info(err)
+    elif err.find('command not found') != -1:
+      logging.info("apache2 is probably not installed")
+    else:
+      logging.info(err)
+      logging.info("Try looking in " + error_log_path + " for details")
+  else:
+    logging.info("OK")
+
+if __name__ == "__main__":
+  main();
diff --git a/tests/DumpRenderTree2/assets/run_layout_tests.py b/tests/DumpRenderTree2/assets/run_layout_tests.py
new file mode 100755
index 0000000..b13d8c9
--- /dev/null
+++ b/tests/DumpRenderTree2/assets/run_layout_tests.py
@@ -0,0 +1,65 @@
+#!/usr/bin/python
+
+"""Run layout tests on the device.
+
+  It runs the specified tests on the device, downloads the summaries to the temporary directory
+  and opens html details in the default browser.
+
+  Usage:
+    run_layout_tests.py PATH
+"""
+
+import sys
+import os
+import subprocess
+import logging
+import webbrowser
+import tempfile
+
+#TODO: These should not be hardcoded
+RESULTS_ABSOLUTE_PATH = "/sdcard/android/LayoutTests-results/"
+DETAILS_HTML = "details.html"
+SUMMARY_TXT = "summary.txt"
+
+def main():
+  if len(sys.argv) > 1:
+    path = sys.argv[1]
+  else:
+    path = ""
+
+  logging.basicConfig(level=logging.INFO, format='%(message)s')
+
+  tmpdir = tempfile.gettempdir()
+
+  # Run the tests in path
+  cmd = "adb shell am instrument "
+  cmd += "-e class com.android.dumprendertree2.scriptsupport.Starter#startLayoutTests "
+  cmd += "-e path \"" + path + "\" "
+  cmd +="-w com.android.dumprendertree2/com.android.dumprendertree2.scriptsupport.ScriptTestRunner"
+
+  logging.info("Running the tests...")
+  subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+
+  logging.info("Downloading the summaries...")
+
+  # Download the txt summary to tmp folder
+  summary_txt_tmp_path = os.path.join(tmpdir, SUMMARY_TXT)
+  cmd = "adb pull " + RESULTS_ABSOLUTE_PATH + SUMMARY_TXT + " " + summary_txt_tmp_path
+  subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+
+  # Download the html summary to tmp folder
+  details_html_tmp_path = os.path.join(tmpdir, DETAILS_HTML)
+  cmd = "adb pull " + RESULTS_ABSOLUTE_PATH + DETAILS_HTML + " " + details_html_tmp_path
+  subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+
+  # Print summary to console
+  logging.info("All done.\n")
+  cmd = "cat " + summary_txt_tmp_path
+  os.system(cmd)
+  logging.info("")
+
+  # Open the browser with summary
+  webbrowser.open(details_html_tmp_path)
+
+if __name__ == "__main__":
+  main();