summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-06-12 08:38:20 +0100
committer Nicolas Geoffray <ngeoffray@google.com> 2015-06-12 08:38:20 +0100
commit2b84d2b94bc973c1b1ed0af3aeb441790af01124 (patch)
treedc8066c49aaa2883a2239dd6b72f4de790de84d3
parentbb6a5557fc63283111b3145d36c09a97fc99fa4e (diff)
Don't run 098-ddmc, it's flaky.
Change-Id: I3fa559f84b2c3a1ce9b07b8d3a27723dc84b3a3e
-rw-r--r--test/Android.run-test.mk17
1 files changed, 4 insertions, 13 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index ecea91c5c6..b948e4b1b0 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -229,19 +229,10 @@ endif
TEST_ART_BROKEN_NO_RELOCATE_TESTS :=
-# Tests that are broken with GC stress.
-# TODO: remove 098-ddmc from the list once the old behavior of getRecentAllocation() of DDMS
-# is restored. b/20037135
-TEST_ART_BROKEN_GCSTRESS_RUN_TESTS := \
- 098-ddmc
-
-ifneq (,$(filter gcstress,$(GC_TYPES)))
- ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \
- $(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),gcstress,$(JNI_TYPES), \
- $(IMAGE_TYPES), $(PICTEST_TYPES), $(DEBUGGABLE_TYPES), $(TEST_ART_BROKEN_GCSTRESS_RUN_TESTS), $(ALL_ADDRESS_SIZES))
-endif
-
-TEST_ART_BROKEN_GCSTRESS_RUN_TESTS :=
+# 098-ddmc is broken until we restore the old behavior of getRecentAllocation() of DDMS. b/20037135
+ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \
+ $(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \
+ $(IMAGE_TYPES), $(PICTEST_TYPES), $(DEBUGGABLE_TYPES), 098-ddmc, $(ALL_ADDRESS_SIZES))
# 115-native-bridge setup is complicated. Need to implement it correctly for the target.
ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,target,$(RUN_TYPES),$(PREBUILD_TYPES),$(COMPILER_TYPES), \