commit 0530bccdc6e79d6015d16cb868444a19004f3bf9
author Vladimir Marko <vmarko@google.com> Mon Mar 12 13:30:42 2018 +0000
committer Vladimir Marko <vmarko@google.com> Mon Mar 12 13:30:42 2018 +0000
tree d7600eb236fba4fb7a0448594e880d3a64b43dd5
parent 9992e095643f6746361df03c4c98e742d9ad5899

Fix oatdump_app_test for address sanitizer.

Pass -Xmx64M to dex2oat to reduce the memory allocation as
the test was failing to allocate the default 512MiB heap
area for certain address sanitation configs.

Test: SANITIZE_HOST=address ASAN_OPTIONS=detect_leaks=0 \
      ART_HEAP_POISONING=true ART_USE_READ_BARRIER=false \
      m test-art-host-gtest-oatdump_app_test
Bug: 74378710

Change-Id: I74503df6e98a113a86a938150d69399c9eead306

oatdump/oatdump_app_test.cc

diff --git a/oatdump/oatdump_app_test.cc b/oatdump/oatdump_app_test.cc
index f125222..34b07d2 100644
--- a/oatdump/oatdump_app_test.cc
+++ b/oatdump/oatdump_app_test.cc
@@ -20,25 +20,29 @@
 
 TEST_F(OatDumpTest, TestAppWithBootImage) {
   std::string error_msg;
-  ASSERT_TRUE(GenerateAppOdexFile(kDynamic, {}, &error_msg)) << error_msg;
+  ASSERT_TRUE(GenerateAppOdexFile(kDynamic, {"--runtime-arg", "-Xmx64M"}, &error_msg)) << error_msg;
   ASSERT_TRUE(Exec(kDynamic, kModeOatWithBootImage, {}, kListAndCode, &error_msg)) << error_msg;
 }
 TEST_F(OatDumpTest, TestAppWithBootImageStatic) {
   TEST_DISABLED_FOR_NON_STATIC_HOST_BUILDS();
   std::string error_msg;
-  ASSERT_TRUE(GenerateAppOdexFile(kStatic, {}, &error_msg)) << error_msg;
+  ASSERT_TRUE(GenerateAppOdexFile(kStatic, {"--runtime-arg", "-Xmx64M"}, &error_msg)) << error_msg;
   ASSERT_TRUE(Exec(kStatic, kModeOatWithBootImage, {}, kListAndCode, &error_msg)) << error_msg;
 }
 
 TEST_F(OatDumpTest, TestPicAppWithBootImage) {
   std::string error_msg;
-  ASSERT_TRUE(GenerateAppOdexFile(kDynamic, {"--compile-pic"}, &error_msg)) << error_msg;
+  ASSERT_TRUE(
+      GenerateAppOdexFile(kDynamic, {"--runtime-arg", "-Xmx64M", "--compile-pic"}, &error_msg))
+      << error_msg;
   ASSERT_TRUE(Exec(kDynamic, kModeOatWithBootImage, {}, kListAndCode, &error_msg)) << error_msg;
 }
 TEST_F(OatDumpTest, TestPicAppWithBootImageStatic) {
   TEST_DISABLED_FOR_NON_STATIC_HOST_BUILDS();
   std::string error_msg;
-  ASSERT_TRUE(GenerateAppOdexFile(kStatic, {"--compile-pic"}, &error_msg)) << error_msg;
+  ASSERT_TRUE(
+      GenerateAppOdexFile(kStatic, {"--runtime-arg", "-Xmx64M", "--compile-pic"}, &error_msg))
+      << error_msg;
   ASSERT_TRUE(Exec(kStatic, kModeOatWithBootImage, {}, kListAndCode, &error_msg)) << error_msg;
 }