Fix oatdump tests on target.
Fix tests broken by
https://android-review.googlesource.com/835240
As these are currently TEST_DISABLED_FOR_ARM_AND_MIPS,
we hit these failures only on fugu on buildbot.
Test: m test-art-host-gtest
Test: m test-art-target-gtest # With manually enabled tests.
Bug: 119868597
Change-Id: If365fc8b8feae4b6cf95f8fd5bab83ad952cb281
diff --git a/oatdump/oatdump_test.h b/oatdump/oatdump_test.h
index 728939f..dfa659b 100644
--- a/oatdump/oatdump_test.h
+++ b/oatdump/oatdump_test.h
@@ -178,6 +178,11 @@
expected_prefixes.push_back("InlineInfo");
}
if (mode == kModeArt) {
+ exec_argv.push_back("--runtime-arg");
+ exec_argv.push_back(GetClassPathOption("-Xbootclasspath:", GetLibCoreDexFileNames()));
+ exec_argv.push_back("--runtime-arg");
+ exec_argv.push_back(
+ GetClassPathOption("-Xbootclasspath-locations:", GetLibCoreDexLocations()));
exec_argv.push_back("--image=" + core_art_location_);
exec_argv.push_back("--instruction-set=" + std::string(
GetInstructionSetString(kRuntimeISA)));