From bbcc01a5a38d28c221c05788e56473a287f57589 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Tue, 30 Jun 2015 14:16:48 +0100 Subject: Make compiler-related gtests honor ART_USE_OPTIMIZING_COMPILER. Previously, gtests using the art::CommonCompilerTest class were using Quick as compiler. Now, setting the environment variable ART_USE_OPTIMIZING_COMPILER to `true` before building and running these tests will use Optimizing instead. Change-Id: I724a3215d2eb1841089745fbabb5cb58b0422ef3 --- compiler/common_compiler_test.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'compiler/common_compiler_test.cc') diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 0a1e2e35a6..4b6788429a 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -182,13 +182,11 @@ void CommonCompilerTest::SetUp() { } } - // TODO: make selectable - Compiler::Kind compiler_kind = Compiler::kQuick; timer_.reset(new CumulativeLogger("Compilation times")); compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), verification_results_.get(), method_inliner_map_.get(), - compiler_kind, instruction_set, + compiler_kind_, instruction_set, instruction_set_features_.get(), true, GetImageClasses(), @@ -211,6 +209,14 @@ void CommonCompilerTest::SetUpRuntimeOptions(RuntimeOptions* options) { CompilerCallbacks::CallbackMode::kCompileApp)); } +Compiler::Kind CommonCompilerTest::GetCompilerKind() const { + return compiler_kind_; +} + +void CommonCompilerTest::SetCompilerKind(Compiler::Kind compiler_kind) { + compiler_kind_ = compiler_kind; +} + void CommonCompilerTest::TearDown() { timer_.reset(); compiler_driver_.reset(); -- cgit v1.2.3-59-g8ed1b