diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-29 13:56:36 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-29 20:29:12 -0700 |
| commit | bb9c6b1c55e9e2308b4f5892a398a8837231fdbd (patch) | |
| tree | b2ba358bd031b73050f22eea5bcccfc1f6f1add1 /runtime/oat_file_assistant_test.cc | |
| parent | f381645a336f7092ab6f5900c0a2cf183a9dbdf7 (diff) | |
| download | art-bb9c6b1c55e9e2308b4f5892a398a8837231fdbd.zip art-bb9c6b1c55e9e2308b4f5892a398a8837231fdbd.tar.gz art-bb9c6b1c55e9e2308b4f5892a398a8837231fdbd.tar.bz2 | |
ART: Refactor callbacks_ in common_runtime_test
The callback is now important for some runtime checks, and just
resetting callbacks_ is not correct anymore.
Change-Id: I2cb806f1916fd5ea190911a833ce460be557a428
Diffstat (limited to 'runtime/oat_file_assistant_test.cc')
| -rw-r--r-- | runtime/oat_file_assistant_test.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc index b2798d3..0422fcd 100644 --- a/runtime/oat_file_assistant_test.cc +++ b/runtime/oat_file_assistant_test.cc @@ -27,6 +27,7 @@ #include "class_linker.h" #include "common_runtime_test.h" +#include "compiler_callbacks.h" #include "mem_map.h" #include "os.h" #include "thread-inl.h" @@ -77,11 +78,7 @@ class OatFileAssistantTest : public CommonRuntimeTest { nullptr)); // Make sure compilercallbacks are not set so that relocation will be // enabled. - for (std::pair<std::string, const void*>& pair : *options) { - if (pair.first == "compilercallbacks") { - pair.second = nullptr; - } - } + callbacks_.reset(); } virtual void PreRuntimeCreate() { |