diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-02-24 23:23:58 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-02-26 13:17:44 -0800 |
| commit | a1ce1fef2d49d1d537776a5308ace7102a815fe5 (patch) | |
| tree | a1afe850d9ebd21f4b751eb68e1ec3dc60dab001 /runtime/exception_test.cc | |
| parent | 930f7b843ddc6e6530439d3fdb0e2133a6292f1e (diff) | |
| download | art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.tar.gz art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.tar.bz2 art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.zip | |
Split up CommonTest into CommonRuntimeTest and CommonCompilerTest
Change-Id: I8dcf6b29a5aecd445f1a3ddb06386cf81dbc9c70
Diffstat (limited to 'runtime/exception_test.cc')
| -rw-r--r-- | runtime/exception_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/exception_test.cc b/runtime/exception_test.cc index 910a817b2e..3653b37dcf 100644 --- a/runtime/exception_test.cc +++ b/runtime/exception_test.cc @@ -15,10 +15,10 @@ */ #include "class_linker.h" -#include "common_test.h" +#include "common_runtime_test.h" #include "dex_file.h" #include "gtest/gtest.h" -#include "leb128_encoder.h" +#include "leb128.h" #include "mirror/class-inl.h" #include "mirror/object_array-inl.h" #include "mirror/object-inl.h" @@ -32,10 +32,10 @@ namespace art { -class ExceptionTest : public CommonTest { +class ExceptionTest : public CommonRuntimeTest { protected: virtual void SetUp() { - CommonTest::SetUp(); + CommonRuntimeTest::SetUp(); ScopedObjectAccess soa(Thread::Current()); SirtRef<mirror::ClassLoader> class_loader( @@ -77,7 +77,7 @@ class ExceptionTest : public CommonTest { method_f_ = my_klass_->FindVirtualMethod("f", "()I"); ASSERT_TRUE(method_f_ != NULL); method_f_->SetFrameSizeInBytes(kStackAlignment); - method_f_->SetEntryPointFromQuickCompiledCode(CompiledMethod::CodePointer(&fake_code_[sizeof(code_size)], kThumb2)); + method_f_->SetEntryPointFromQuickCompiledCode(&fake_code_[sizeof(code_size)]); method_f_->SetMappingTable(&fake_mapping_data_.GetData()[0]); method_f_->SetVmapTable(&fake_vmap_table_data_.GetData()[0]); method_f_->SetNativeGcMap(&fake_gc_map_[0]); @@ -85,7 +85,7 @@ class ExceptionTest : public CommonTest { method_g_ = my_klass_->FindVirtualMethod("g", "(I)V"); ASSERT_TRUE(method_g_ != NULL); method_g_->SetFrameSizeInBytes(kStackAlignment); - method_g_->SetEntryPointFromQuickCompiledCode(CompiledMethod::CodePointer(&fake_code_[sizeof(code_size)], kThumb2)); + method_g_->SetEntryPointFromQuickCompiledCode(&fake_code_[sizeof(code_size)]); method_g_->SetMappingTable(&fake_mapping_data_.GetData()[0]); method_g_->SetVmapTable(&fake_vmap_table_data_.GetData()[0]); method_g_->SetNativeGcMap(&fake_gc_map_[0]); |