summaryrefslogtreecommitdiffstats
path: root/test/Android.run-test.mk
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-04-24 20:22:06 -0700
committerAndreas Gampe <agampe@google.com>2015-04-24 20:22:06 -0700
commit94329d31d2a99c9aff889b88ba4b675135409b82 (patch)
tree661df73fd35c4281438667abd488fb282175a8b1 /test/Android.run-test.mk
parent6e655afb37a528cfd90aa702b1600e1eb5d10a58 (diff)
downloadart-94329d31d2a99c9aff889b88ba4b675135409b82.zip
art-94329d31d2a99c9aff889b88ba4b675135409b82.tar.gz
art-94329d31d2a99c9aff889b88ba4b675135409b82.tar.bz2
ART: Duplicate-classes cleanup
Disable old test. Improve collision warning message. Add a comment about the algorithm. Change-Id: Ibd29d79565732162150aebd7fe08d0895ccf3d79
Diffstat (limited to 'test/Android.run-test.mk')
-rw-r--r--test/Android.run-test.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 4ecabcc..93340fb 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -250,6 +250,12 @@ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,target,$(RUN_TYPES),$(PREBUIL
$(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES),$(IMAGE_TYPES), \
$(PICTEST_TYPES),$(DEBUGGABLE_TYPES),130-hprof,$(ALL_ADDRESS_SIZES))
+# 131 is an old test. The functionality has been implemented at an earlier stage and is checked
+# in tests 138.
+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),131-structural-change,$(ALL_ADDRESS_SIZES))
+
# All these tests check that we have sane behavior if we don't have a patchoat or dex2oat.
# Therefore we shouldn't run them in situations where we actually don't have these since they
# explicitly test for them. These all also assume we have an image.