summaryrefslogtreecommitdiffstats
path: root/test/114-ParallelGC
diff options
context:
space:
mode:
authorSebastien Hertz <shertz@google.com>2015-02-24 17:39:50 +0100
committerSebastien Hertz <shertz@google.com>2015-07-09 11:23:13 +0200
commit5ee9454dfee08a70dec62b0ed0fd4ad274274937 (patch)
tree0d59bfc38f70c677d8ecd066618ed17dd838259b /test/114-ParallelGC
parentc2bf1255ebf360d009dd0763dcea8d2c9b9c676e (diff)
downloadart-5ee9454dfee08a70dec62b0ed0fd4ad274274937.zip
art-5ee9454dfee08a70dec62b0ed0fd4ad274274937.tar.gz
art-5ee9454dfee08a70dec62b0ed0fd4ad274274937.tar.bz2
Support compiling run-tests with jack
This CL adds support to compile run-test source files with jack. When a test needs to rely on class files, we use jill to convert them to a jack library. We need to pass the full classpath to jack containing at least core classes (like java.lang.Object). This means the Android tree must have been compiled with jack first so we find all the necessary classes.jack files. Some tests still rely on dex files generated with the old toolchain. We keep building them this way for the moment and will update them later, when they get ready for Jack. Also updates a few tests dealing with garbage collection to avoid a situation where a reference can be retained by a local DEX register. Bug: 19467889 (cherry picked from commit 19ac0276208f0afef6ba8a4ab34b74a59b8d11d7) Change-Id: Ia5a989b83430ffe8298a869a1da970b756721bb0
Diffstat (limited to 'test/114-ParallelGC')
-rw-r--r--test/114-ParallelGC/src/Main.java23
1 files changed, 12 insertions, 11 deletions
diff --git a/test/114-ParallelGC/src/Main.java b/test/114-ParallelGC/src/Main.java
index 46029cf..159dd5c 100644
--- a/test/114-ParallelGC/src/Main.java
+++ b/test/114-ParallelGC/src/Main.java
@@ -53,20 +53,21 @@ public class Main implements Runnable {
}
// Allocate objects to definitely run GC before quitting.
- ArrayList<Object> l = new ArrayList<Object>();
- try {
- for (int i = 0; i < 100000; i++) {
- l.add(new ArrayList<Object>(i));
- }
- } catch (OutOfMemoryError oom) {
- }
- // Make the (outer) ArrayList unreachable. Note it may still
- // be reachable under an interpreter or a compiler without a
- // liveness analysis.
- l = null;
+ allocateObjectsToRunGc();
+
new ArrayList<Object>(50);
}
+ private static void allocateObjectsToRunGc() {
+ ArrayList<Object> l = new ArrayList<Object>();
+ try {
+ for (int i = 0; i < 100000; i++) {
+ l.add(new ArrayList<Object>(i));
+ }
+ } catch (OutOfMemoryError oom) {
+ }
+ }
+
private Main(CyclicBarrier startBarrier) {
this.startBarrier = startBarrier;
}