diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 15:08:24 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 15:08:24 +0100 |
commit | 674c9666d3405bac361677c72d2fb7c16f31dbad (patch) | |
tree | ea84d2c20955fffda046e6c9dbcd1ac596b47bb2 /luni/src/test/java/libcore/java/lang/ref/FinalizeTest.java | |
parent | 3a8f57d2dc82c0879b0e29fbdfaad9b9fb44e6f6 (diff) | |
parent | 1b7c3672b5219216119eb288d4363324a7f6667e (diff) | |
download | libcore-674c9666d3405bac361677c72d2fb7c16f31dbad.zip libcore-674c9666d3405bac361677c72d2fb7c16f31dbad.tar.gz libcore-674c9666d3405bac361677c72d2fb7c16f31dbad.tar.bz2 |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_libcore into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'luni/src/test/java/libcore/java/lang/ref/FinalizeTest.java')
-rw-r--r-- | luni/src/test/java/libcore/java/lang/ref/FinalizeTest.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/luni/src/test/java/libcore/java/lang/ref/FinalizeTest.java b/luni/src/test/java/libcore/java/lang/ref/FinalizeTest.java index ef303bd..d71b5b0 100644 --- a/luni/src/test/java/libcore/java/lang/ref/FinalizeTest.java +++ b/luni/src/test/java/libcore/java/lang/ref/FinalizeTest.java @@ -69,13 +69,18 @@ public final class FinalizeTest extends TestCase { static class X {} - // http://b/issue?id=2136462 - public void testBackFromTheDead() throws Exception { + // Helper function since we do not want a vreg to keep the allocated object live. + // For b/25851249 + private void exceptionInConstructor() { try { new ConstructionFails(); } catch (AssertionError expected) { } + } + // http://b/issue?id=2136462 + public void testBackFromTheDead() throws Exception { + exceptionInConstructor(); FinalizationTester.induceFinalization(); assertTrue("object whose constructor threw was not finalized", ConstructionFails.finalized); } |