Skip to content
Permalink
Browse files

8235490: AppCDS DynamicArchiveRelocationTest.java failed: 'always map…

… archive(s) at an alternative address' missing

Reviewed-by: coleenp, ccheung
  • Loading branch information
iklam committed Dec 9, 2019
1 parent ade72f4 commit 749bda0e2dc07881b2d9a1d60b8d559d4aaa6ad0
@@ -2052,6 +2052,7 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
if (result == MAP_ARCHIVE_MMAP_FAILURE) {
// Mapping has failed (probably due to ASLR). Let's map at an address chosen
// by the OS.
log_info(cds)("Try to map archive(s) at an alternative address");
result = map_archives(static_mapinfo, dynamic_mapinfo, false);
}
}
@@ -80,7 +80,7 @@ static void test(boolean dump_reloc, boolean run_reloc) throws Exception {
TestCommon.run("-cp", appJar, unlockArg, runRelocArg, logArg, mainClass)
.assertNormalExit(output -> {
if (run_reloc) {
output.shouldContain("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
output.shouldContain("Try to map archive(s) at an alternative address");
}
});
}
@@ -88,7 +88,7 @@ static void doTest() throws Exception {
String baseArchiveName = getNewArchiveName("base");
String topArchiveName = getNewArchiveName("top");

String runtimeMsg = "ArchiveRelocationMode == 1: always map archive(s) at an alternative address";
String runtimeMsg = "Try to map archive(s) at an alternative address";
String unlockArg = "-XX:+UnlockDiagnosticVMOptions";

// (1) Dump base archive (static)

0 comments on commit 749bda0

Please sign in to comment.
You can’t perform that action at this time.