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

Commit 1058c63b authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 1909 into donut 

* changes:
  Fixed IndexOutofBoundException, improved how memory information is captured (run GC first)
parents af999280 2a197b12

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -223,7 +223,10 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
    }

    }

    

    

    private String getExpectedResultFile(String test) {

    private String getExpectedResultFile(String test) {

        String shortName = test.substring(0, test.lastIndexOf('.'));

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

        if(pos == -1)

            return null;

        String shortName = test.substring(0, pos);

        return shortName + "-expected.txt";          

        return shortName + "-expected.txt";          

    }

    }
@@ -303,6 +306,10 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
        });

        });





        String resultFile = getResultFile(test);

        String resultFile = getResultFile(test);

        if(resultFile == null) {

            //simply ignore this test

            return;

        }

        if (mRebaselineResults) {

        if (mRebaselineResults) {

            String expectedResultFile = getExpectedResultFile(test);

            String expectedResultFile = getExpectedResultFile(test);

            File f = new File(expectedResultFile);

            File f = new File(expectedResultFile);

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

+10 −2
Original line number Original line Diff line number Diff line
@@ -69,11 +69,14 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel 




        TestShellActivity activity = (TestShellActivity) getActivity();

        TestShellActivity activity = (TestShellActivity) getActivity();





        Log.v(LOGTAG, "About to run tests, calling gc first...");

        Runtime.getRuntime().runFinalization();

        Runtime.getRuntime().gc();

        Runtime.getRuntime().gc();



        // Run tests

        // Run tests

        runTestAndWaitUntilDone(activity, runner.mTestPath, runner.mTimeoutInMillis);

        runTestAndWaitUntilDone(activity, runner.mTestPath, runner.mTimeoutInMillis);





        // TODO(fqian): let am instrumentation pass in the command line, currently

        // am instrument does not allow spaces in the command.

        dumpMemoryInfo();

        dumpMemoryInfo();





        // Kill activity

        // Kill activity
@@ -82,6 +85,11 @@ public class LoadTestsAutoTest extends ActivityInstrumentationTestCase2<TestShel 




    private void dumpMemoryInfo() {

    private void dumpMemoryInfo() {

        try {

        try {

            Log.v(LOGTAG, "About to dump meminfo, calling gc first...");

            Runtime.getRuntime().runFinalization();

            Runtime.getRuntime().gc();

            Runtime.getRuntime().gc();



            Log.v(LOGTAG, "Dumping memory information.");

            Log.v(LOGTAG, "Dumping memory information.");





            FileOutputStream out = new FileOutputStream(LOAD_TEST_RESULT, true);

            FileOutputStream out = new FileOutputStream(LOAD_TEST_RESULT, true);