summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-09-12 09:22:18 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-09-12 09:22:19 +0000
commit580f3c4ba69fbc909f8c727b8e84597efa57c9a3 (patch)
treebceb8f03c34cc1ff5cb206efb1fbed34ddf3d17b
parent87068b4782c184d1d2e5b99a640a0328ca1198f2 (diff)
parent7cb4fb03a21b1806c8f370081c59f5e979f9baa7 (diff)
Merge "Blacklist failing test after critical JNI changes."
-rw-r--r--test/Android.run-test.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 06ca09827c..6a98fb5858 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -338,7 +338,9 @@ endif
TEST_ART_BROKEN_NO_RELOCATE_TESTS :=
# Temporarily disable some broken tests when forcing access checks in interpreter b/22414682
+# 004-JniTest is disabled because @CriticalNative is unsupported by generic JNI b/31400248
TEST_ART_BROKEN_INTERPRETER_ACCESS_CHECK_TESTS := \
+ 004-JniTest \
137-cfi
ifneq (,$(filter interp-ac,$(COMPILER_TYPES)))