summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-03-01 09:10:43 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-03-01 09:10:43 +0000
commiteff87a33bf5323b002fe58bcfd808d284f38eefc (patch)
tree11bd3dc32b7b5c16b57b4026e33a35e587c20583
parent9f03916ff79dca0d529a39c0202b67ac256cf9df (diff)
parent2f0d3bc12f9ade80f4d3c21b7c4aad2cfe10f19e (diff)
Merge "Disable flaky 130-hprof test."
-rw-r--r--test/Android.run-test.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 167ad859d2..d6a05ea3dd 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -222,8 +222,10 @@ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),
# Disable 097-duplicate-method while investigation (broken by latest Jack release, b/27358065)
+# Disable 130-hprof, it has races (b/27337759)
TEST_ART_BROKEN_ALL_TARGET_TESTS := \
- 097-duplicate-method
+ 097-duplicate-method \
+ 130-hprof
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), \