summaryrefslogtreecommitdiffstats
path: root/test/068-classloader
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2012-01-11 11:56:56 -0800
committerIan Rogers <irogers@google.com>2012-01-11 11:56:56 -0800
commit725aee5889a9e57c08689f6c1cb9763e8d1fd377 (patch)
tree38f99953b4c6aea4ada9fc6dc6ec243316cf8188 /test/068-classloader
parent761bfa80704937024fdbe58c2b6fd4599760efaf (diff)
downloadart-725aee5889a9e57c08689f6c1cb9763e8d1fd377.tar.gz
art-725aee5889a9e57c08689f6c1cb9763e8d1fd377.tar.bz2
art-725aee5889a9e57c08689f6c1cb9763e8d1fd377.zip
Fixes for 071-dexfile
Ensure dex2oat has the correct process group. Don't unmap dex file in DexFile.open. Diagnostic warning messages in DexFile.open in particular as the class loader will swallow the IOExceptions without logging. Fix location of test-ex.jar for test 068-classloader. Change-Id: Ie54ebb98b687db1eb30091c86de9beb860c26c3d
Diffstat (limited to 'test/068-classloader')
-rw-r--r--test/068-classloader/src/FancyLoader.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/068-classloader/src/FancyLoader.java b/test/068-classloader/src/FancyLoader.java
index 173b08f567..28c17a814c 100644
--- a/test/068-classloader/src/FancyLoader.java
+++ b/test/068-classloader/src/FancyLoader.java
@@ -35,10 +35,10 @@ import java.lang.reflect.InvocationTargetException;
*/
public class FancyLoader extends ClassLoader {
/* this is where the "alternate" .class files live */
- static final String CLASS_PATH = "classes-ex/";
+ static final String CLASS_PATH = "/data/art-test";
/* this is the "alternate" DEX/Jar file */
- static final String DEX_FILE = "test-ex.jar";
+ static final String DEX_FILE = "068-classloader-ex.jar";
/* on Dalvik, this is a DexFile; otherwise, it's null */
private Class mDexClass;
@@ -94,7 +94,7 @@ public class FancyLoader extends ClassLoader {
}
try {
- mDexFile = ctor.newInstance(DEX_FILE);
+ mDexFile = ctor.newInstance(CLASS_PATH + File.separator + DEX_FILE);
} catch (InstantiationException ie) {
throw new ClassNotFoundException("newInstance failed", ie);
} catch (IllegalAccessException iae) {