diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-07 19:46:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 19:46:03 +0000 |
| commit | 0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9 (patch) | |
| tree | 9e34129dba00354c7e2ab5d57cd43278036d2b89 | |
| parent | 0e13957a4deab3a90492d9ae2f6d35d3b5c1773e (diff) | |
| parent | 3bd33f1d9e8af826fa95095ca391d40f6c75ca2a (diff) | |
| download | frameworks_base-0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9.zip frameworks_base-0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9.tar.gz frameworks_base-0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9.tar.bz2 | |
am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
Fix tests on jenkins, take 2.
| -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()); } |