8344718: Test runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java fails on Linuxppc64le after JDK-8344239
Reviewed-by: ccheung, mdoerr
This commit is contained in:
parent
a07b72bfcf
commit
8903854e01
@ -34,13 +34,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import jdk.test.lib.process.OutputAnalyzer;
|
import jdk.test.lib.process.OutputAnalyzer;
|
||||||
import jdk.test.whitebox.WhiteBox;
|
import jdk.test.whitebox.code.Compiler;
|
||||||
|
|
||||||
public class AddmodsOption {
|
public class AddmodsOption {
|
||||||
|
|
||||||
private static final WhiteBox WB = WhiteBox.getWhiteBox();
|
|
||||||
private static final boolean isJVMCISupported = WB.getBooleanVMFlag("EnableJVMCI");
|
|
||||||
|
|
||||||
public static void main(String[] args) throws Exception {
|
public static void main(String[] args) throws Exception {
|
||||||
final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main";
|
final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main";
|
||||||
final String incubatorModule = "jdk.incubator.vector";
|
final String incubatorModule = "jdk.incubator.vector";
|
||||||
@ -143,7 +140,7 @@ public class AddmodsOption {
|
|||||||
.shouldContain("subgraph jdk.internal.module.ArchivedBootLayer is not recorde")
|
.shouldContain("subgraph jdk.internal.module.ArchivedBootLayer is not recorde")
|
||||||
.shouldHaveExitValue(0);
|
.shouldHaveExitValue(0);
|
||||||
|
|
||||||
if (isJVMCISupported) {
|
if (Compiler.isJVMCIEnabled()) {
|
||||||
// dump an archive with JVMCI option which indirectly adds the
|
// dump an archive with JVMCI option which indirectly adds the
|
||||||
// jdk.internal.vm.ci module using the --add-modules option
|
// jdk.internal.vm.ci module using the --add-modules option
|
||||||
archiveName = TestCommon.getNewArchiveName("jvmci-module");
|
archiveName = TestCommon.getNewArchiveName("jvmci-module");
|
||||||
|
Loading…
Reference in New Issue
Block a user