diff options
author | Guang Zhu <guangzhu@google.com> | 2010-02-22 16:16:24 -0800 |
---|---|---|
committer | Guang Zhu <guangzhu@google.com> | 2010-02-22 17:45:05 -0800 |
commit | 8cd303aec6f11ea9fece70f6e3d82efb607f8637 (patch) | |
tree | c906279cf543333e40b8afecf7dc651b685b21d3 /tests/DumpRenderTree | |
parent | 469888fe84f48febbe8a1c1ade455ffeac828079 (diff) | |
download | frameworks_base-8cd303aec6f11ea9fece70f6e3d82efb607f8637.zip frameworks_base-8cd303aec6f11ea9fece70f6e3d82efb607f8637.tar.gz frameworks_base-8cd303aec6f11ea9fece70f6e3d82efb607f8637.tar.bz2 |
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.
Diffstat (limited to 'tests/DumpRenderTree')
-rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java index 8983612..634d683 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java @@ -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; |