summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Light <allight@google.com> 2015-11-13 19:07:37 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-11-13 19:07:37 +0000
commit0e06a0989f4fc53e0d281a5a2cb5b5a17feaea0c (patch)
treebe6bac2236a43d9a871f8a4174a47f99439ffb51
parentf6ebcd099aeaa694fada7ce4a77b1698488d8121 (diff)
parent9b0f516d3da1dfe10471ab760edc8206809ce829 (diff)
Merge "Disable test 964 with gcstress since it often times out."
-rw-r--r--test/Android.run-test.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index b5287216ce..9d13da7980 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -305,12 +305,13 @@ TEST_ART_BROKEN_INTERPRETER_ACCESS_CHECK_TESTS :=
# Tests that are broken with GC stress.
# * 137-cfi needs to unwind a second forked process. We're using a primitive sleep to wait till we
# hope the second process got into the expected state. The slowness of gcstress makes this bad.
-# * 961-default-iface-resolution-generated is a very long test that often will take more than the
-# timeout to run when gcstress is enabled. This is because gcstress slows down allocations
-# significantly which this test does a lot.
+# * 961-default-iface-resolution-generated and 964-default-iface-init-generated are very long tests
+# that often will take more than the timeout to run when gcstress is enabled. This is because
+# gcstress slows down allocations significantly which these tests do a lot.
TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := \
137-cfi \
- 961-default-iface-resolution-generated
+ 961-default-iface-resolution-generated \
+ 964-default-iface-init-generated
ifneq (,$(filter gcstress,$(GC_TYPES)))
ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \