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

8191653: Test failures in BootAppendTests - missing jdk.internal.vm.compiler module

Browse Source 
Backout the fix for 8190975

Reviewed-by: iklam, kvn
This commit is contained in:
Calvin Cheung 2017-11-22 16:08:39 -08:00
parent cd0c6d0fae
commit 81032ed30f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java
View File

@ -169,7 +169,7 @@ public class BootAppendTests {
CDSOptions opts = (new CDSOptions()) CDSOptions opts = (new CDSOptions())
.setXShareMode(mode).setUseVersion(false) .setXShareMode(mode).setUseVersion(false)
.addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion", .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
"--limit-modules=java.base,jdk.internal.vm.compiler", "-cp", appJar) "--limit-modules=java.base", "-cp", appJar)
.addSuffix("-Xlog:class+load=info", .addSuffix("-Xlog:class+load=info",
APP_CLASS, BOOT_APPEND_MODULE_CLASS_NAME); APP_CLASS, BOOT_APPEND_MODULE_CLASS_NAME);
@ -198,7 +198,7 @@ public class BootAppendTests {
CDSOptions opts = (new CDSOptions()) CDSOptions opts = (new CDSOptions())
.setXShareMode(mode).setUseVersion(false) .setXShareMode(mode).setUseVersion(false)
.addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion", .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
"--limit-modules=java.base,jdk.internal.vm.compiler", "-cp", appJar) "--limit-modules=java.base", "-cp", appJar)
.addSuffix("-Xlog:class+load=info", .addSuffix("-Xlog:class+load=info",
APP_CLASS, BOOT_APPEND_DUPLICATE_MODULE_CLASS_NAME); APP_CLASS, BOOT_APPEND_DUPLICATE_MODULE_CLASS_NAME);
@ -226,7 +226,7 @@ public class BootAppendTests {
CDSOptions opts = (new CDSOptions()) CDSOptions opts = (new CDSOptions())
.setXShareMode(mode).setUseVersion(false) .setXShareMode(mode).setUseVersion(false)
.addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion", .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
"--limit-modules=java.base,jdk.internal.vm.compiler", "-cp", appJar) "--limit-modules=java.base", "-cp", appJar)
.addSuffix("-Xlog:class+load=info", .addSuffix("-Xlog:class+load=info",
APP_CLASS, BOOT_APPEND_CLASS_NAME); APP_CLASS, BOOT_APPEND_CLASS_NAME);

14
test/jdk/java/lang/String/concat/WithSecurityManager.java
View File

@ -38,13 +38,13 @@ import java.security.Permission;
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT WithSecurityManager * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT WithSecurityManager
* @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT WithSecurityManager * @run main/othervm -Xverify:all -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT WithSecurityManager
* *
* @run main/othervm -Xverify:all --limit-modules=java.base,jdk.internal.vm.compiler WithSecurityManager * @run main/othervm -Xverify:all --limit-modules=java.base WithSecurityManager
* @run main/othervm -Xverify:all --limit-modules=java.base,jdk.internal.vm.compiler -Djava.lang.invoke.stringConcat=BC_SB WithSecurityManager * @run main/othervm -Xverify:all --limit-modules=java.base -Djava.lang.invoke.stringConcat=BC_SB WithSecurityManager
* @run main/othervm -Xverify:all --limit-modules=java.base,jdk.internal.vm.compiler -Djava.lang.invoke.stringConcat=BC_SB_SIZED WithSecurityManager * @run main/othervm -Xverify:all --limit-modules=java.base -Djava.lang.invoke.stringConcat=BC_SB_SIZED WithSecurityManager
* @run main/othervm -Xverify:all --limit-modules=java.base,jdk.internal.vm.compiler -Djava.lang.invoke.stringConcat=MH_SB_SIZED WithSecurityManager * @run main/othervm -Xverify:all --limit-modules=java.base -Djava.lang.invoke.stringConcat=MH_SB_SIZED WithSecurityManager
* @run main/othervm -Xverify:all --limit-modules=java.base,jdk.internal.vm.compiler -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT WithSecurityManager * @run main/othervm -Xverify:all --limit-modules=java.base -Djava.lang.invoke.stringConcat=BC_SB_SIZED_EXACT WithSecurityManager
* @run main/othervm -Xverify:all --limit-modules=java.base,jdk.internal.vm.compiler -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT WithSecurityManager * @run main/othervm -Xverify:all --limit-modules=java.base -Djava.lang.invoke.stringConcat=MH_SB_SIZED_EXACT WithSecurityManager
* @run main/othervm -Xverify:all --limit-modules=java.base,jdk.internal.vm.compiler -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT WithSecurityManager * @run main/othervm -Xverify:all --limit-modules=java.base -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT WithSecurityManager
*/ */
public class WithSecurityManager { public class WithSecurityManager {
public static void main(String[] args) throws Throwable { public static void main(String[] args) throws Throwable {