From 6449c62e40ef3a9bb75f664f922555affb532ee4 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Mon, 10 Feb 2014 23:48:36 -0800 Subject: Create CompilerOptions Package up most compiler related options in CompilerOptions. Details include: - Includes compiler filter, method thresholds, SEA IR mode. - Excludes those needed during Runtime::Init such as CompilerCallbacks and VerificationResults. - Pass CompilerOptions to CompilerDriver. - Remove CompilerOptions from Runtime. - Add ability to pass options for app and image dex2oat to runtime via -Xcompiler-option and -Ximage-compiler-option respectively. Other - Replace 2x CompilerCallbacks implementations with one. - Factor out execv code for use by both image and oat generation. - More OatFile error_msg reporting. - DCHECK for SuspendAll found trying to run valgrind. Change-Id: Iecb57da907be0c856d00c3cd634b5042a229e620 --- runtime/utils_test.cc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'runtime/utils_test.cc') diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc index b43177b4fd..ff65e47b11 100644 --- a/runtime/utils_test.cc +++ b/runtime/utils_test.cc @@ -349,4 +349,26 @@ TEST_F(UtilsTest, GetDalvikCacheFilenameOrDie) { CheckGetDalvikCacheFilenameOrDie("/system/framework/boot.art", "system@framework@boot.art"); } +TEST_F(UtilsTest, ExecSuccess) { + std::vector command; + if (kIsTargetBuild) { + command.push_back("/system/bin/id"); + } else { + command.push_back("/usr/bin/id"); + } + std::string error_msg; + EXPECT_TRUE(Exec(command, &error_msg)); + EXPECT_EQ(0U, error_msg.size()) << error_msg; +} + +// TODO: Disabled due to hang tearing down CommonTest. +// Renable after splitting into RuntimeTest and CompilerTest. +TEST_F(UtilsTest, DISABLED_ExecError) { + std::vector command; + command.push_back("bogus"); + std::string error_msg; + EXPECT_FALSE(Exec(command, &error_msg)); + EXPECT_NE(0U, error_msg.size()); +} + } // namespace art -- cgit v1.2.3-59-g8ed1b