diff options
| author | Andreas Gampe <agampe@google.com> | 2015-06-03 15:43:16 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-06-03 16:12:30 -0700 |
| commit | 0fc16a09b4d2323f9c2b6aabc81ce120b278329b (patch) | |
| tree | d6050e2528c073521cf4a3d0154cdd3d70959a26 /test | |
| parent | 8f23620d45399286564986d2541cda761b3fe0ac (diff) | |
| download | art-0fc16a09b4d2323f9c2b6aabc81ce120b278329b.zip art-0fc16a09b4d2323f9c2b6aabc81ce120b278329b.tar.gz art-0fc16a09b4d2323f9c2b6aabc81ce120b278329b.tar.bz2 | |
Revert "Revert "Turn off duplicate-classes checking""
This reverts commit 18a1827a159f1b235f3fcc934f428059185f550e.
Bug: 21333911
Change-Id: I8cb96efbf7151b238f3ee137a938b20ddfaf0ebc
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 f6c9231..c9e512e 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. |