OpenJDK / amber / amber
changeset 56741:d109188f6480
8224710: [TESTBUG] dynamicArchive/ExcludedClasses.java test failed in tier6 testing on Windows
Summary: Account for the failure in loading of the base archive in CDSTestUtils::isUnableToMap().
Reviewed-by: jiangli, iklam
| author | ccheung |
|---|---|
| date | Wed, 12 Jun 2019 10:45:46 -0700 |
| parents | 466d6e2d2ddf |
| children | 139f21bad9fd |
| files | src/hotspot/share/memory/metaspace.cpp test/lib/jdk/test/lib/cds/CDSTestUtils.java |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/memory/metaspace.cpp Wed Jun 12 10:37:35 2019 -0700 +++ b/src/hotspot/share/memory/metaspace.cpp Wed Jun 12 10:45:46 2019 -0700 @@ -1221,7 +1221,7 @@ } 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)
--- a/test/lib/jdk/test/lib/cds/CDSTestUtils.java Wed Jun 12 10:37:35 2019 -0700 +++ b/test/lib/jdk/test/lib/cds/CDSTestUtils.java Wed Jun 12 10:45:46 2019 -0700 @@ -357,7 +357,8 @@ 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; }