Simplify command line arguments
Change-Id: I9d6902b0c447fd8fbe5600fd36139791b2ceefb7
diff --git a/src/runtime_test.cc b/src/runtime_test.cc
index 66c181b..ce03571 100644
--- a/src/runtime_test.cc
+++ b/src/runtime_test.cc
@@ -27,7 +27,7 @@
options.push_back(std::make_pair(lib_core.c_str(), null));
options.push_back(std::make_pair("-cp", null));
options.push_back(std::make_pair(lib_core.c_str(), null));
- options.push_back(std::make_pair("-Xbootimage:boot_image", null));
+ options.push_back(std::make_pair("-Ximage:boot_image", null));
options.push_back(std::make_pair("-Ximage:image_1", null));
options.push_back(std::make_pair("-Ximage:image_2", null));
options.push_back(std::make_pair("-Xcheck:jni", null));
@@ -37,22 +37,24 @@
options.push_back(std::make_pair("-Dfoo=bar", null));
options.push_back(std::make_pair("-Dbaz=qux", null));
options.push_back(std::make_pair("-verbose:gc,class,jni", null));
+ options.push_back(std::make_pair("host-prefix", "host_prefix"));
options.push_back(std::make_pair("vfprintf", test_vfprintf));
options.push_back(std::make_pair("abort", test_abort));
options.push_back(std::make_pair("exit", test_exit));
UniquePtr<Runtime::ParsedOptions> parsed(Runtime::ParsedOptions::Create(options, false));
ASSERT_TRUE(parsed.get() != NULL);
- EXPECT_EQ(1U, parsed->boot_class_path_.size());
- EXPECT_EQ(1U, parsed->class_path_.size());
- EXPECT_STREQ("boot_image", parsed->boot_image_);
- EXPECT_EQ(2U, parsed->images_.size());
- EXPECT_STREQ("image_1", parsed->images_[0]);
- EXPECT_STREQ("image_2", parsed->images_[1]);
+ EXPECT_EQ(lib_core, parsed->boot_class_path_);
+ EXPECT_EQ(lib_core, parsed->class_path_);
+ EXPECT_EQ(3U, parsed->images_.size());
+ EXPECT_EQ(std::string("boot_image"), parsed->images_[0]);
+ EXPECT_EQ(std::string("image_1"), parsed->images_[1]);
+ EXPECT_EQ(std::string("image_2"), parsed->images_[2]);
EXPECT_EQ(true, parsed->check_jni_);
EXPECT_EQ(2048U, parsed->heap_initial_size_);
EXPECT_EQ(4 * KB, parsed->heap_maximum_size_);
EXPECT_EQ(1 * MB, parsed->stack_size_);
+ EXPECT_EQ("host_prefix", parsed->host_prefix_);
EXPECT_TRUE(test_vfprintf == parsed->hook_vfprintf_);
EXPECT_TRUE(test_exit == parsed->hook_exit_);
EXPECT_TRUE(test_abort == parsed->hook_abort_);