summaryrefslogtreecommitdiff
path: root/oatdump/oatdump_app_test.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2019-02-26 09:51:56 +0000
committer Vladimir Marko <vmarko@google.com> 2019-02-27 11:22:24 +0000
commitffe26cc54fac4f1997e5dbf6991da9e95ce49e31 (patch)
tree90ab59966e687d4d801a3360d9af5264dd9f04f7 /oatdump/oatdump_app_test.cc
parentd736ebcb7fb2b2612b25df6eee06a494921eba3a (diff)
Revert^2 "Fix oatdump .data.bimg.rel.ro for intrinsics."
This reverts commit 44044b1522c7486ca8b308bf49b1f39b82626e6d. Failing test was disabled for SS/GSS/Debug GC. Test: Additional test in oatdump_app_test Test: m test-art-host-gtest Bug: 71526895 Bug: 126305867 Change-Id: I2cf598ef735ca87430cdb007e7331ad444edad43
Diffstat (limited to 'oatdump/oatdump_app_test.cc')
-rw-r--r--oatdump/oatdump_app_test.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/oatdump/oatdump_app_test.cc b/oatdump/oatdump_app_test.cc
index 2b04a0d295..4490647d2c 100644
--- a/oatdump/oatdump_app_test.cc
+++ b/oatdump/oatdump_app_test.cc
@@ -28,4 +28,18 @@ TEST_F(OatDumpTest, TestAppWithBootImageStatic) {
ASSERT_TRUE(Exec(kStatic, kModeOatWithBootImage, {}, kListAndCode));
}
+TEST_F(OatDumpTest, TestAppImageWithBootImage) {
+ TEST_DISABLED_WITHOUT_BAKER_READ_BARRIERS(); // GC bug, b/126305867
+ const std::string app_image_arg = "--app-image-file=" + GetAppImageName();
+ ASSERT_TRUE(GenerateAppOdexFile(kDynamic, {"--runtime-arg", "-Xmx64M", app_image_arg}));
+ ASSERT_TRUE(Exec(kDynamic, kModeAppImage, {}, kListAndCode));
+}
+TEST_F(OatDumpTest, TestAppImageWithBootImageStatic) {
+ TEST_DISABLED_WITHOUT_BAKER_READ_BARRIERS(); // GC bug, b/126305867
+ TEST_DISABLED_FOR_NON_STATIC_HOST_BUILDS();
+ const std::string app_image_arg = "--app-image-file=" + GetAppImageName();
+ ASSERT_TRUE(GenerateAppOdexFile(kStatic, {"--runtime-arg", "-Xmx64M", app_image_arg}));
+ ASSERT_TRUE(Exec(kStatic, kModeAppImage, {}, kListAndCode));
+}
+
} // namespace art