Skip to content

Commit 749bda0

Browse files
committedDec 9, 2019
8235490: AppCDS DynamicArchiveRelocationTest.java failed: 'always map archive(s) at an alternative address' missing
Reviewed-by: coleenp, ccheung
1 parent ade72f4 commit 749bda0

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed
 

‎src/hotspot/share/memory/metaspaceShared.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -2052,6 +2052,7 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
20522052
if (result == MAP_ARCHIVE_MMAP_FAILURE) {
20532053
// Mapping has failed (probably due to ASLR). Let's map at an address chosen
20542054
// by the OS.
2055+
log_info(cds)("Try to map archive(s) at an alternative address");
20552056
result = map_archives(static_mapinfo, dynamic_mapinfo, false);
20562057
}
20572058
}

‎test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static void test(boolean dump_reloc, boolean run_reloc) throws Exception {
8080
TestCommon.run("-cp", appJar, unlockArg, runRelocArg, logArg, mainClass)
8181
.assertNormalExit(output -> {
8282
if (run_reloc) {
83-
output.shouldContain("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
83+
output.shouldContain("Try to map archive(s) at an alternative address");
8484
}
8585
});
8686
}

‎test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static void doTest() throws Exception {
8888
String baseArchiveName = getNewArchiveName("base");
8989
String topArchiveName = getNewArchiveName("top");
9090

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

9494
// (1) Dump base archive (static)

0 commit comments

Comments
 (0)
Please sign in to comment.