diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-06 17:32:26 -0800 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2015-01-06 17:32:26 -0800 |
| commit | 48603a39d4dd721d231c99e10908f4f00c4ec6b9 (patch) | |
| tree | 904da4721e6419a8867227eea1d0d0c37ab79304 /tools | |
| parent | dc649c8da46dc1cc2ac7df41ddde0f28c64db687 (diff) | |
| download | frameworks_base-48603a39d4dd721d231c99e10908f4f00c4ec6b9.zip frameworks_base-48603a39d4dd721d231c99e10908f4f00c4ec6b9.tar.gz frameworks_base-48603a39d4dd721d231c99e10908f4f00c4ec6b9.tar.bz2 | |
Fix tests on jenkins
When the tests are run on the build server, they are run from the jar,
as opposed to the extracted build, which is default when run from an
IDE. Thus, when class.getResourceAsStream() is called with ".." in the
path, it is not resolved properly. This change explicitly resolves the
relative path, so that the test is run properly on the server.
Change-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java | 1 |
1 files changed, 1 insertions, 0 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 b439b34..8085be1 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 @@ -283,6 +283,7 @@ public class Main { } String goldenDataDir = APP_TEST_RES + "/../../../golden/"; try { + goldenDataDir = new File(goldenDataDir).getAbsolutePath(); ImageUtils.requireSimilar(goldenDataDir + "activity.png", session.getImage()); } catch (IOException e) { getLogger().error(e, e.getMessage()); |