commit 751927e83957f34f9d2750a905aeea86b2ca5ae8
author Nicolas Geoffray <ngeoffray@google.com> Wed Dec 21 08:58:27 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Dec 21 08:59:36 2016 +0000
tree e82d50534fc50a5712888565042845ba0f1567d4
parent d54f43ca39dfa92f08c2d760123f185f0f65fb86

Disable 080-oom-fragmentation.

bug:33795328
Test: test-art-host
Change-Id: I1aa87d8564c930f5ad5f8d5c4ac75f432cb6e7e7

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 543ac04..0c822b0 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -227,8 +227,10 @@
 endef  # name-to-var
 
 # Disable 153-reference-stress temporarily until a fix arrives. b/33389022.
+# Disable 080-oom-fragmentation due to flakes. b/33795328
 ART_TEST_RUN_TEST_SKIP += \
-  153-reference-stress
+  153-reference-stress \
+  080-oom-fragmentation
 
 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), \
@@ -677,15 +679,6 @@
   endif
 endif
 
-# Tests disabled for GSS.
-TEST_ART_BROKEN_GSS_RUN_TESTS := 080-oom-fragmentation
-ifeq ($(ART_DEFAULT_GC_TYPE),GSS)
-  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), \
-      $(TEST_ART_BROKEN_GSS_RUN_TESTS),$(ALL_ADDRESS_SIZES))
-endif
-
 TEST_ART_BROKEN_OPTIMIZING_READ_BARRIER_RUN_TESTS :=
 TEST_ART_BROKEN_JIT_READ_BARRIER_RUN_TESTS :=