diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-07-23 18:45:17 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-07-24 10:19:38 -0700 |
| commit | c5a8347ac491a5f521945d3835a322123830456b (patch) | |
| tree | cdbc493e9209607587b11d762044f8e0f4bd7e10 /test | |
| parent | ca928ba8b9e109ced2b9d72622dc34bda63ac211 (diff) | |
| download | art-c5a8347ac491a5f521945d3835a322123830456b.tar.gz art-c5a8347ac491a5f521945d3835a322123830456b.tar.bz2 art-c5a8347ac491a5f521945d3835a322123830456b.zip | |
Fix stale remembered sets error.
We were forgetting to remove the remembered set in transition to
background. This resulted in remembered sets being added for
spaces which no longer existed. This finally caused an error when
a new space happened to have the same address as the old space,
resulting in a CHECK failure.
Also tuned the number of ParallelGC to prevent spurrious failures
and removed the ParallelGC from broken tests in the make file.
Bug: 16532086
Bug: 16406852
Change-Id: I00bbcbd7daa03c867732d165be62b72e6c43bce1
Diffstat (limited to 'test')
| -rw-r--r-- | test/114-ParallelGC/src/Main.java | 2 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/114-ParallelGC/src/Main.java b/test/114-ParallelGC/src/Main.java index fb110bd035..2285872ab0 100644 --- a/test/114-ParallelGC/src/Main.java +++ b/test/114-ParallelGC/src/Main.java @@ -39,7 +39,7 @@ public class Main implements Runnable { public void run() { List l = new ArrayList(); - for (int i = 0; i < 500; i++) { + for (int i = 0; i < 400; i++) { l.add(new ArrayList(i)); } } diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index ac47da6871..78493dc0f5 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -112,8 +112,7 @@ ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_ART_BROKEN_TRACE_RUN_TESTS), $(c # Tests that need more than 2MB of RAM or are running into other corner cases in GC stress related # to OOMEs. -TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := \ - 114-ParallelGC +TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_ART_BROKEN_GCSTRESS_RUN_TESTS), $(call all-run-test-names,$(test),-gcstress,-relocate)) ART_TEST_KNOWN_BROKEN += $(foreach test, $(TEST_ART_BROKEN_GCSTRESS_RUN_TESTS), $(call all-run-test-names,$(test),-gcstress,-no-prebuild)) |