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

Commit 0e2bae14 authored by Steve Block's avatar Steve Block
Browse files

Update DumpRenderTree2 to reflect removal of WEBKIT_MERGE_REVISION 

We now use ThirdPartyProject.prop
See https://android-git.corp.google.com/g/#change,64831

Change-Id: Ib52fdd93ac08fb19ec8b7f539eb084c0b668e01b
parent 8bb37f7f

tests/DumpRenderTree2/assets/run_apache2.py

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ def main(): 
  directives += " -c \"Alias /LayoutTests " + layout_tests_path + "\""

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

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

  directives += " -c \"Alias /WEBKIT_MERGE_REVISION " + \

    os.path.join(webkit_path, "WEBKIT_MERGE_REVISION") + "\""

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

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



  # 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.

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

+5 −6
Original line number Diff line number Diff line
@@ -326,15 +326,14 @@ public class Summarizer { 
    private String getWebKitRevision() {

        URL url = null;

        try {

            url = new URL(ForwarderManager.getHostSchemePort(false) + "WEBKIT_MERGE_REVISION");

            url = new URL(ForwarderManager.getHostSchemePort(false) + "ThirdPartyProject.prop");

        } catch (MalformedURLException e) {

            assert false;

        }



        String webkitMergeRevisionFileContents = new String(FsUtils.readDataFromUrl(url));

        Matcher matcher =

            Pattern.compile("http://svn.webkit.org/repository/webkit/trunk@([0-9]+)").matcher(

                    webkitMergeRevisionFileContents);

        String thirdPartyProjectContents = new String(FsUtils.readDataFromUrl(url));

        Matcher matcher = Pattern.compile("^version=([0-9]+)", Pattern.MULTILINE).matcher(

                thirdPartyProjectContents);

        if (matcher.find()) {

            return matcher.group(1);

        }