archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 16:44:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8249624: update appcds/sharedStrings/IncompatibleOptions test in view of 8081416 closed as WNF

Browse source 
With CDS can archive with compressed oops off, the result of the test gives correct information.

Reviewed-by: iklam, dholmes
This commit is contained in:
Yumin Qi 2020-07-24 10:29:27 -07:00
parent a0149f53f1
commit 4b076cb93f
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
View file

@ -109,7 +109,7 @@ public class IncompatibleOptions {
testDump(2, "-XX:+UseParallelGC", "", GC_WARNING, false); testDump(2, "-XX:+UseParallelGC", "", GC_WARNING, false);
testDump(3, "-XX:+UseSerialGC", "", GC_WARNING, false); testDump(3, "-XX:+UseSerialGC", "", GC_WARNING, false);
// ======= archive with compressed oops, run w/o // Explicitly archive with compressed oops, run without.
testDump(5, "-XX:+UseG1GC", "-XX:+UseCompressedOops", null, false); testDump(5, "-XX:+UseG1GC", "-XX:+UseCompressedOops", null, false);
testExec(5, "-XX:+UseG1GC", "-XX:-UseCompressedOops", testExec(5, "-XX:+UseG1GC", "-XX:-UseCompressedOops",
COMPRESSED_OOPS_NOT_CONSISTENT, true); COMPRESSED_OOPS_NOT_CONSISTENT, true);
@ -124,20 +124,25 @@ public class IncompatibleOptions {
testExec(9, "-XX:+UseG1GC", "-XX:ObjectAlignmentInBytes=16", testExec(9, "-XX:+UseG1GC", "-XX:ObjectAlignmentInBytes=16",
OBJ_ALIGNMENT_MISMATCH, true); OBJ_ALIGNMENT_MISMATCH, true);
// See JDK-8081416 - Oops encoding mismatch with shared strings // Implicitly archive with compressed oops, run without.
// produces unclear or incorrect warning // Max heap size for compressed oops is around 31G.
// Correct the test case once the above is fixed // UseCompressedOops is turned on by default when heap
// @ignore JDK-8081416 - for tracking purposes // size is under 31G, but will be turned off when heap
// for now, run test as is until the proper behavior is determined // size is greater than that.
testDump(10, "-XX:+UseG1GC", "-Xmx1g", null, false); testDump(10, "-XX:+UseG1GC", "-Xmx1g", null, false);
testExec(10, "-XX:+UseG1GC", "-Xmx32g", null, true); testExec(10, "-XX:+UseG1GC", "-Xmx32g", null, true);
// Explicitly archive without compressed oops and run with.
testDump(11, "-XX:+UseG1GC", "-XX:-UseCompressedOops", null, false);
testExec(11, "-XX:+UseG1GC", "-XX:+UseCompressedOops", null, true);
// Implicitly archive without compressed oops and run with.
testDump(12, "-XX:+UseG1GC", "-Xmx32G", null, false);
testExec(12, "-XX:+UseG1GC", "-Xmx1G", null, true);
// CompactStrings must match between dump time and run time // CompactStrings must match between dump time and run time
testDump(11, "-XX:+UseG1GC", "-XX:-CompactStrings", null, false); testDump(13, "-XX:+UseG1GC", "-XX:-CompactStrings", null, false);
testExec(11, "-XX:+UseG1GC", "-XX:+CompactStrings", testExec(13, "-XX:+UseG1GC", "-XX:+CompactStrings",
COMPACT_STRING_MISMATCH, true); COMPACT_STRING_MISMATCH, true);
testDump(12, "-XX:+UseG1GC", "-XX:+CompactStrings", null, false); testDump(14, "-XX:+UseG1GC", "-XX:+CompactStrings", null, false);
testExec(12, "-XX:+UseG1GC", "-XX:-CompactStrings", testExec(14, "-XX:+UseG1GC", "-XX:-CompactStrings",
COMPACT_STRING_MISMATCH, true); COMPACT_STRING_MISMATCH, true);
} }