Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee864481 authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge changes Ibe495cdc,I6f8e5745 

* changes:
  Update DRT2 to reflect WebKit code movement
  Add extra error handling to DRT2 launcher script
parents 970ce730 183c3c9c

tests/DumpRenderTree2/assets/run_apache2.py

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ def main(run_cmd, options): 
  # 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") + "\""

  directives += " -c \"Alias /Tools/DumpRenderTree/android " + \

    os.path.join(webkit_path, "Tools", "DumpRenderTree", "android") + "\""

  directives += " -c \"Alias /ThirdPartyProject.prop " + \

    os.path.join(webkit_path, "ThirdPartyProject.prop") + "\""

tests/DumpRenderTree2/assets/run_layout_tests.py

+6 −0
Original line number Diff line number Diff line
@@ -44,9 +44,15 @@ def main(path, options): 
  logging.info("Running the tests...")

  logging.debug("Command = %s" % cmd)

  (stdoutdata, stderrdata) = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()

  if stderrdata != "":

    logging.info("Failed to start tests:\n%s", stderrdata)

    return

  if re.search("^INSTRUMENTATION_STATUS_CODE: -1", stdoutdata, re.MULTILINE) != None:

    logging.info("Failed to run the tests. Is DumpRenderTree2 installed on the device?")

    return

  if re.search("^OK \([0-9]+ tests?\)", stdoutdata, re.MULTILINE) == None:

    logging.info("DumpRenderTree2 failed to run correctly:\n%s", stdoutdata)

    return



  logging.info("Downloading the summaries...")

tests/DumpRenderTree2/src/com/android/dumprendertree2/FsUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class FsUtils { 
    public static final String LOG_TAG = "FsUtils";



    private static final String SCRIPT_URL = ForwarderManager.getHostSchemePort(false) +

            "WebKitTools/DumpRenderTree/android/get_layout_tests_dir_contents.php";

            "Tools/DumpRenderTree/android/get_layout_tests_dir_contents.php";



    private static final int HTTP_TIMEOUT_MS = 5000;

tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ public class Summarizer { 
        URL url = null;

        try {

            url = new URL("http", "localhost", ForwarderManager.HTTP_PORT,

                    "/WebKitTools/DumpRenderTree/android/view_source.php?src=" +

                    "/Tools/DumpRenderTree/android/view_source.php?src=" +

                    relativePath);

        } catch (MalformedURLException e) {

            assert false : "relativePath=" + relativePath;