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

Commit 8cd303ae authored by Guang Zhu's avatar Guang Zhu
Browse files

Quick fix layout test path problems 

SD card mount point has changed from /sdcard to /mnt/sdcard. layout test was calling getCanonicalPath to determine the path to the test case, which causes problem because /sdcard is now a symlink, and canonical path is actually the "real" path. Using quick dirty fix for now, will properly migrate any hard-coded reference to "/sdcard" to system function calls.
parent 469888fe

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

+2 −13
Original line number Diff line number Diff line
@@ -339,14 +339,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
        this.mTestList = new Vector<String>();



        // Read settings

        try {

            this.mTestPathPrefix =

                (new File(LAYOUT_TESTS_ROOT + runner.mTestPath)).getCanonicalPath();

        } catch (IOException e) {

            Log.e(LOGTAG, "Cannot find test path prefix: " + e.getMessage());

            return;

        }



        this.mTestPathPrefix = (new File(LAYOUT_TESTS_ROOT + runner.mTestPath)).getAbsolutePath();

        this.mRebaselineResults = runner.mRebaseline;



        int timeout = runner.mTimeoutInMillis;
@@ -395,11 +388,7 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh 
        if (runner.mTestPath != null) {

            test_path += runner.mTestPath;

        }

        try {

            test_path = new File(test_path).getCanonicalPath();

        } catch (IOException e) {

            Log.e("LayoutTestsAutoTest", "Cannot get cannonical path " + e.getMessage());

        }

        test_path = new File(test_path).getAbsolutePath();

        Log.v("LayoutTestsAutoTest", " Test path : " + test_path);



        return test_path;