ART: Speed up some gtests.

Avoid creating `Runtime` or create the `Runtime` with a boot
image to make the test setup faster.

Test: m test-art-host-gtest
Test: run-gtests.sh
Change-Id: I3f09de81491402442f1704d25bb06de995d8a3ca

1 files changed, 2 insertions, 16 deletions

diff --git a/runtime/arch/arch_test.cc b/runtime/arch/arch_test.cc
index 23213d9a77..83fd986525 100644
--- a/runtime/arch/arch_test.cc
+++ b/runtime/arch/arch_test.cc
@@ -18,27 +18,13 @@
 
 #include "art_method-inl.h"
 #include "base/callee_save_type.h"
+#include "base/common_art_test.h"
 #include "entrypoints/quick/callee_save_frame.h"
-#include "common_runtime_test.h"
 #include "quick/quick_method_frame_info.h"
 
 namespace art {
 
-class ArchTest : public CommonRuntimeTest {
- protected:
-  void SetUpRuntimeOptions(RuntimeOptions *options) override {
-    // Use 64-bit ISA for runtime setup to make method size potentially larger
-    // than necessary (rather than smaller) during CreateCalleeSaveMethod
-    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());
-  }
-};
+class ArchTest : public CommonArtTest {};
 
 // Grab architecture specific constants.
 namespace arm {