diff options
author | Jeff Hao <jeffhao@google.com> | 2014-07-24 16:26:09 -0700 |
---|---|---|
committer | Jeff Hao <jeffhao@google.com> | 2014-08-06 12:49:57 -0700 |
commit | f0a3f09c3d54646166a55c05a6b39c7dd504129c (patch) | |
tree | 35a76479f1b774ae100727547a48da5bc0878e66 /runtime/proxy_test.cc | |
parent | 484e2c2d3531e5bb36f0e1e12f26c708939c6579 (diff) | |
download | art-f0a3f09c3d54646166a55c05a6b39c7dd504129c.tar.gz art-f0a3f09c3d54646166a55c05a6b39c7dd504129c.tar.bz2 art-f0a3f09c3d54646166a55c05a6b39c7dd504129c.zip |
Fix proxy tracing and enable tests that now work with tracing.
Also updates proxy_test to generate an image for GetQuickOatCodeFor.
Bug: 16386215
Change-Id: Ie7daad3d73ea7b60187bc1e7037ade0df8277107
Diffstat (limited to 'runtime/proxy_test.cc')
-rw-r--r-- | runtime/proxy_test.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/runtime/proxy_test.cc b/runtime/proxy_test.cc index bd6656dda1..308142157c 100644 --- a/runtime/proxy_test.cc +++ b/runtime/proxy_test.cc @@ -17,14 +17,14 @@ #include <jni.h> #include <vector> -#include "common_compiler_test.h" +#include "common_runtime_test.h" #include "field_helper.h" #include "mirror/art_field-inl.h" #include "scoped_thread_state_change.h" namespace art { -class ProxyTest : public CommonCompilerTest { +class ProxyTest : public CommonRuntimeTest { public: // Generate a proxy class with the given name and interfaces. This is a simplification from what // libcore does to fit to our test needs. We do not check for duplicated interfaces or methods and @@ -103,6 +103,12 @@ class ProxyTest : public CommonCompilerTest { soa.Self()->AssertNoPendingException(); return proxyClass; } + + protected: + void SetUpRuntimeOptions(RuntimeOptions *options) OVERRIDE { + options->push_back(std::make_pair(StringPrintf("-Ximage:%s", GetLibCoreOatFileName().c_str()), + nullptr)); + } }; // Creates a proxy class and check ClassHelper works correctly. |