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

8191747: [TESTBUG] runtime/appcds/DumpClassList.java and ProhibitedPackage.java fail on product bits

Browse Source 
Reviewed-by: simonis
This commit is contained in:
Ioi Lam 2017-11-29 18:43:35 -08:00
parent 7617012f55
commit 177b24b7d7
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/hotspot/jtreg/runtime/appcds/DumpClassList.java
View File

@ -93,11 +93,11 @@ public class DumpClassList {
output = TestCommon.createArchive(appJar, appClass,
"-Xbootclasspath/a:" + appendJar,
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+PrintSystemDictionaryAtExit",
"-Xlog:class+load",
"-XX:SharedClassListFile=" + classList);
TestCommon.checkDump(output)
.shouldNotContain("Preload Warning: Cannot find java/lang/invoke/LambdaForm")
.shouldNotContain("Preload Warning: Cannot find boot/append/Foo")
.shouldContain("boot.append.Foo, loader <shared, not restored>");
.shouldContain("[info][class,load] boot.append.Foo");
}
}

10
test/hotspot/jtreg/runtime/appcds/ProhibitedPackage.java
View File

@ -55,11 +55,9 @@ public class ProhibitedPackage {
// Make sure a class in a prohibited package for a custom loader
// will be ignored during dumping.
TestCommon.dump(appJar,
classlist,
"-XX:+PrintSystemDictionaryAtExit")
TestCommon.dump(appJar, classlist, "-Xlog:cds")
.shouldContain("Dumping")
.shouldNotContain("java.lang.Prohibited")
.shouldContain("[cds] Prohibited package for non-bootstrap classes: java/lang/Prohibited.class")
.shouldHaveExitValue(0);
}
@ -68,9 +66,9 @@ public class ProhibitedPackage {
// will be ignored during dumping.
TestCommon.dump(appJar,
TestCommon.list("java/lang/Prohibited", "ProhibitedHelper"),
"-XX:+PrintSystemDictionaryAtExit")
"-Xlog:class+load")
.shouldContain("Dumping")
.shouldNotContain("java.lang.Prohibited")
.shouldNotContain("[info][class,load] java.lang.Prohibited source: ")
.shouldHaveExitValue(0);
// Try loading the class in a prohibited package with various -Xshare