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

Commit a8883757 authored by Steve Block's avatar Steve Block
Browse files

Update DumpRenderTree to look in platform/android for Android-specific results 

Change-Id: I32044fc8e22d419762e275cd69b0c785a7f4c8a5
parent 59c76b87

tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java

+10 −2
Original line number Original line Diff line number Diff line
@@ -222,14 +222,22 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
        // The generic result is at <path>/<name>-expected.txt

        // The generic result is at <path>/<name>-expected.txt

        // First try the Android-specific result at

        // First try the Android-specific result at

        // platform/android-<js-engine>/<path>/<name>-expected.txt

        // platform/android-<js-engine>/<path>/<name>-expected.txt

        // then

        // platform/android/<path>/<name>-expected.txt

        int pos = test.lastIndexOf('.');

        int pos = test.lastIndexOf('.');

        if (pos == -1)

        if (pos == -1)

            return null;

            return null;

        String genericExpectedResult = test.substring(0, pos) + "-expected.txt";

        String genericExpectedResult = test.substring(0, pos) + "-expected.txt";

        String androidExpectedResultsDir = "platform/android-" + mJsEngine + "/";

        String androidExpectedResultsDir = "platform/android-" + mJsEngine + "/";

        String androidExpectedResult =

        String androidExpectedResult = genericExpectedResult.replaceFirst(LAYOUT_TESTS_ROOT,

            genericExpectedResult.replaceFirst(LAYOUT_TESTS_ROOT, LAYOUT_TESTS_ROOT + androidExpectedResultsDir);

                LAYOUT_TESTS_ROOT + androidExpectedResultsDir);

        File f = new File(androidExpectedResult);

        File f = new File(androidExpectedResult);

        if (f.exists())

            return androidExpectedResult;

        androidExpectedResultsDir = "platform/android/";

        androidExpectedResult = genericExpectedResult.replaceFirst(LAYOUT_TESTS_ROOT,

                LAYOUT_TESTS_ROOT + androidExpectedResultsDir);

        f = new File(androidExpectedResult);

        return f.exists() ? androidExpectedResult : genericExpectedResult;

        return f.exists() ? androidExpectedResult : genericExpectedResult;

    }

    }