From a00f012660e9a4baa34c0ab96042f7146e9a6017 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 16 Dec 2015 16:54:35 -0800 Subject: ART: Refactor CommonRuntimeTest::SetUp Factor out finishing up the runtime. This code will execute the interpreter to initialize important classes etc., which is not necessary for testing RuntimeMethod sizes and trampoline entrypoints, in fact it may violate pointer-size invariants. Also add InstructionSet parsing tests to the ParsedOptions test. Change-Id: I75cd00c6d358e1bc962c8f1845244f6400c1cd6c --- runtime/common_runtime_test.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'runtime/common_runtime_test.h') diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 6da2bef214..f3184578b6 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -114,6 +114,10 @@ class CommonRuntimeTest : public testing::Test { // Called after the runtime is created. virtual void PostRuntimeCreate() {} + // Called to finish up runtime creation and filling test fields. By default runs root + // initializers, initialize well-known classes, and creates the heap thread pool. + virtual void FinalizeSetup(); + // Gets the path of the specified dex file for host or target. static std::string GetDexFileName(const std::string& jar_prefix); -- cgit v1.2.3-59-g8ed1b