diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-07 23:53:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-07 23:53:09 +0000 |
| commit | d8e99c5861b09de8f709c9284240e2c3115507bb (patch) | |
| tree | 3cc6008cd4c2c2a2de8cfdb8abb910c312dfc041 /tools/layoutlib | |
| parent | 97b7b8637bc50cbcd9ad9a63fcb34355439b0701 (diff) | |
| parent | 0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9 (diff) | |
| download | frameworks_base-d8e99c5861b09de8f709c9284240e2c3115507bb.zip frameworks_base-d8e99c5861b09de8f709c9284240e2c3115507bb.tar.gz frameworks_base-d8e99c5861b09de8f709c9284240e2c3115507bb.tar.bz2 | |
am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
automerge: 0b1188e
* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
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()); } |