summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-02-19 01:20:33 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-02-19 01:20:33 +0000
commit627fbe3137995904c2d67822d79201e17225e797 (patch)
tree8c5190c03d2990cef7259921a1140732f1b77b2f
parent2ee8837c49680fa0c928fb5d5fc6ef7ae6532eea (diff)
parent9cb65bcea36aaabe00e39c061adf35727d251402 (diff)
Merge "ART: Blacklist run-test 802 for tracing"
-rw-r--r--test/Android.run-test.mk13
1 files changed, 13 insertions, 0 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index a8f2001930..c8e0ec5216 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -271,6 +271,19 @@ endif
TEST_ART_BROKEN_FALLBACK_RUN_TESTS :=
+# This test dynamically enables tracing to force a deoptimization. This makes the test meaningless
+# when already tracing, and writes an error message that we do not want to check for.
+TEST_ART_BROKEN_TRACING_RUN_TESTS := \
+ 802-deoptimization
+
+ifneq (,$(filter trace,$(TRACE_TYPES)))
+ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \
+ $(COMPILER_TYPES),$(RELOCATE_TYPES),trace,$(GC_TYPES),$(JNI_TYPES),$(IMAGE_TYPES), \
+ $(PICTEST_TYPES),$(TEST_ART_BROKEN_TRACING_RUN_TESTS),$(ALL_ADDRESS_SIZES))
+endif
+
+TEST_ART_BROKEN_TRACING_RUN_TESTS :=
+
# The following tests use libarttest.so, which is linked against libartd.so, so will
# not work when libart.so is the one loaded.
# TODO: Find a way to run these tests in ndebug mode.