summaryrefslogtreecommitdiffstats
path: root/test/074-gc-thrash
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2015-02-03 10:10:52 +0000
committerNicolas Geoffray <ngeoffray@google.com>2015-02-03 10:10:52 +0000
commit67f65ea9ca0826ff16397694bfb9c4858a958453 (patch)
treee9adb87a30c5b0a3cf7cebf8e1a70388e5eace4c /test/074-gc-thrash
parented8b53d679d46891d8d405b0ce4a48c282d872f7 (diff)
downloadart-67f65ea9ca0826ff16397694bfb9c4858a958453.zip
art-67f65ea9ca0826ff16397694bfb9c4858a958453.tar.gz
art-67f65ea9ca0826ff16397694bfb9c4858a958453.tar.bz2
Revert "Revert "ART: Make 074-gc-thrash more OOME tolerant""
This reverts commit ed8b53d679d46891d8d405b0ce4a48c282d872f7. This wasn't the reason for breakage. Instead, it was the Makefile change in: https://android-review.googlesource.com/#/c/128250/ Change-Id: Ib94870c1eccbe821e3b4945ea92ca35ca0a8a9b9
Diffstat (limited to 'test/074-gc-thrash')
-rw-r--r--test/074-gc-thrash/src/Main.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/074-gc-thrash/src/Main.java b/test/074-gc-thrash/src/Main.java
index 32fbf2d..238e73a 100644
--- a/test/074-gc-thrash/src/Main.java
+++ b/test/074-gc-thrash/src/Main.java
@@ -292,8 +292,8 @@ class Deep extends Thread {
break;
}
- strong[depth] = funStr;
weak[depth] = new WeakReference(funStr);
+ strong[depth] = funStr;
if (depth+1 < MAX_DEPTH)
dive(depth+1, iteration+1);
else