diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-06-16 21:21:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-16 15:40:29 +0000 |
| commit | eaac24f37a814c54073ef438cf93f2181464b562 (patch) | |
| tree | 1e90e15bac85d23a62d836b8375284a70afbff04 /runtime | |
| parent | 0cfcd2e480e92104657c36b2f0075e56ecd697fb (diff) | |
| parent | 52fa81425dec4794bdf751ad015264e7d5c74a71 (diff) | |
| download | art-eaac24f37a814c54073ef438cf93f2181464b562.zip art-eaac24f37a814c54073ef438cf93f2181464b562.tar.gz art-eaac24f37a814c54073ef438cf93f2181464b562.tar.bz2 | |
Merge "Disable StubTest.IndexOf if heap poisoning is enabled for now."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/stub_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/arch/stub_test.cc b/runtime/arch/stub_test.cc index 7785bc3..22b8cca 100644 --- a/runtime/arch/stub_test.cc +++ b/runtime/arch/stub_test.cc @@ -1796,6 +1796,8 @@ extern "C" void art_quick_indexof(void); TEST_F(StubTest, StringIndexOf) { #if defined(__arm__) || defined(__aarch64__) + TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING(); + Thread* self = Thread::Current(); ScopedObjectAccess soa(self); // garbage is created during ClassLinker::Init |