summaryrefslogtreecommitdiff
path: root/runtime/arch/arch_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/arch/arch_test.cc')
-rw-r--r--runtime/arch/arch_test.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/runtime/arch/arch_test.cc b/runtime/arch/arch_test.cc
index d6ba304bd1..1680bbda1e 100644
--- a/runtime/arch/arch_test.cc
+++ b/runtime/arch/arch_test.cc
@@ -30,6 +30,13 @@ class ArchTest : public CommonRuntimeTest {
options->push_back(std::make_pair("imageinstructionset", "x86_64"));
}
+ // Do not do any of the finalization. We don't want to run any code, we don't need the heap
+ // prepared, it actually will be a problem with setting the instruction set to x86_64 in
+ // SetUpRuntimeOptions.
+ void FinalizeSetup() OVERRIDE {
+ ASSERT_EQ(InstructionSet::kX86_64, Runtime::Current()->GetInstructionSet());
+ }
+
static void CheckFrameSize(InstructionSet isa, Runtime::CalleeSaveType type, uint32_t save_size)
NO_THREAD_SAFETY_ANALYSIS {
Runtime* const runtime = Runtime::Current();