diff options
| author | Andreas Gampe <agampe@google.com> | 2015-05-21 21:15:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 21:15:41 +0000 |
| commit | 9953ca938c3b4418b2fe67396970a96fc2c62ab0 (patch) | |
| tree | 7477197e0dadda90094d4fff5338b0c43badb809 /test | |
| parent | 99ca40cf9d390479a7243b8b3321cad7d9faa2a4 (diff) | |
| parent | 18a1827a159f1b235f3fcc934f428059185f550e (diff) | |
| download | android_art-9953ca938c3b4418b2fe67396970a96fc2c62ab0.tar.gz android_art-9953ca938c3b4418b2fe67396970a96fc2c62ab0.tar.bz2 android_art-9953ca938c3b4418b2fe67396970a96fc2c62ab0.zip | |
Merge "Revert "DO NOT MERGE ART: Turn off duplicate-classes checking"" into mnc-dev
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.run-test.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index c9e512ed5d..f6c92318bc 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -256,11 +256,6 @@ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES), $(COMPILER_TYPES),$(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES),$(IMAGE_TYPES), \ $(PICTEST_TYPES),$(DEBUGGABLE_TYPES),131-structural-change,$(ALL_ADDRESS_SIZES)) -# 138-duplicate-classes-check. Turned off temporarily, b/21333911. -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),138-duplicate-classes-check,$(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. |