diff options
| author | Andreas Gampe <agampe@google.com> | 2015-05-20 14:48:10 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-05-20 14:48:10 -0700 |
| commit | aafcfca5fe545365ef377fff2897b8a908f03e71 (patch) | |
| tree | acfe09e3501f113027e2693adf17a49709e0c386 /test | |
| parent | 5d52f3dca52548f4a4598abd06432cad3dca6b8a (diff) | |
| download | art-aafcfca5fe545365ef377fff2897b8a908f03e71.tar.gz art-aafcfca5fe545365ef377fff2897b8a908f03e71.tar.bz2 art-aafcfca5fe545365ef377fff2897b8a908f03e71.zip | |
DO NOT MERGE ART: Turn off duplicate-classes checking
Bug: 21333911
Change-Id: I9832526a6d2996aadb459e3ec0930cbaf151478a
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.run-test.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 40f5f00b8f..ff69d6e309 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -256,6 +256,11 @@ 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. |