stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8224710: [TESTBUG] dynamicArchive/ExcludedClasses.java test failed in tier6 testing on Windows

Browse Source 
Account for the failure in loading of the base archive in CDSTestUtils::isUnableToMap().

Reviewed-by: jiangli, iklam
This commit is contained in:
Calvin Cheung 2019-06-12 10:45:46 -07:00
parent 919c0e9d8e
commit f1a897b494
2 changed files with 3 additions and 2 deletions
src/hotspot/share/memory
metaspace.cpp
test/lib/jdk/test/lib/cds
CDSTestUtils.java

2
src/hotspot/share/memory/metaspace.cpp

@ -1221,7 +1221,7 @@ void Metaspace::global_initialize() {
}
if (DynamicDumpSharedSpaces && !UseSharedSpaces) {
vm_exit_during_initialization("DynamicDumpSharedSpaces not supported when base CDS archive is not loaded", NULL);
vm_exit_during_initialization("DynamicDumpSharedSpaces is unsupported when base CDS archive is not loaded", NULL);
}
if (!DumpSharedSpaces && !UseSharedSpaces)

3
test/lib/jdk/test/lib/cds/CDSTestUtils.java

@ -357,7 +357,8 @@ public class CDSTestUtils {
outStr.contains("Unable to map MiscCode shared space at required address") ||
outStr.contains("Unable to map OptionalData shared space at required address") ||
outStr.contains("Could not allocate metaspace at a compatible address") ||
outStr.contains("UseSharedSpaces: Unable to allocate region, range is not within java heap") ))
outStr.contains("UseSharedSpaces: Unable to allocate region, range is not within java heap") ||
outStr.contains("DynamicDumpSharedSpaces is unsupported when base CDS archive is not loaded") ))
{
return true;
}