diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-08 00:03:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-08 00:03:58 +0000 |
| commit | 5df729ad09b85cb68bdf37d58c5d429c2c8663a4 (patch) | |
| tree | 86793c477e5bd8fb24ee82b7e2f20927a0a1c983 /tools/layoutlib | |
| parent | 04b30fa00b5ae9c05c307dbfa2ba7d8028402999 (diff) | |
| parent | a98a9b30bea74478b9d1b3f16e3713f5c864e648 (diff) | |
| download | frameworks_base-5df729ad09b85cb68bdf37d58c5d429c2c8663a4.zip frameworks_base-5df729ad09b85cb68bdf37d58c5d429c2c8663a4.tar.gz frameworks_base-5df729ad09b85cb68bdf37d58c5d429c2c8663a4.tar.bz2 | |
am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e
* commit 'a98a9b30bea74478b9d1b3f16e3713f5c864e648':
Fix tests on jenkins, take 2.
Diffstat (limited to 'tools/layoutlib')
| -rw-r--r-- | tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java index 8085be1..96725af 100644 --- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java +++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java @@ -76,7 +76,10 @@ public class Main { private static final String PLATFORM_DIR; private static final String TEST_RES_DIR; - private static final String APP_TEST_RES = "/testApp/MyApplication/src/main/res"; + /** Location of the app to test inside {@link #TEST_RES_DIR}*/ + private static final String APP_TEST_DIR = "/testApp/MyApplication"; + /** Location of the app's res dir inside {@link #TEST_RES_DIR}*/ + private static final String APP_TEST_RES = APP_TEST_DIR + "/src/main/res"; private LayoutLog mLayoutLibLog; private FrameworkResources mFrameworkRepo; @@ -281,10 +284,9 @@ public class Main { getLogger().error(session.getResult().getException(), session.getResult().getErrorMessage()); } - String goldenDataDir = APP_TEST_RES + "/../../../golden/"; try { - goldenDataDir = new File(goldenDataDir).getAbsolutePath(); - ImageUtils.requireSimilar(goldenDataDir + "activity.png", session.getImage()); + String goldenImagePath = APP_TEST_DIR + "/golden/activity.png"; + ImageUtils.requireSimilar(goldenImagePath, session.getImage()); } catch (IOException e) { getLogger().error(e, e.getMessage()); } |