diff options
| -rw-r--r-- | compiler/driver/compiler_driver_test.cc | 1 | ||||
| -rw-r--r-- | runtime/common_runtime_test.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 949fade..86034c8 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -146,6 +146,7 @@ TEST_F(CompilerDriverTest, DISABLED_LARGE_CompileDexLibCore) { TEST_F(CompilerDriverTest, AbstractMethodErrorStub) { TEST_DISABLED_FOR_PORTABLE(); + TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING(); jobject class_loader; { ScopedObjectAccess soa(Thread::Current()); diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index cfe808c..4b50cf4 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -341,6 +341,13 @@ class CheckJniAbortCatcher { return; \ } +// TODO: When heap reference poisoning works with the compiler, get rid of this. +#define TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING() \ + if (kPoisonHeapReferences) { \ + printf("WARNING: TEST DISABLED FOR HEAP REFERENCE POISONING\n"); \ + return; \ + } + } // namespace art namespace std { |