diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT index ffc70d1bb18..b48a86d4d6d 100644 --- a/test/hotspot/jtreg/TEST.ROOT +++ b/test/hotspot/jtreg/TEST.ROOT @@ -46,13 +46,16 @@ requires.extraPropDefns.bootlibs = ../../lib/jdk/test/whitebox requires.extraPropDefns.libs = \ ../../lib/jdk/test/lib/Platform.java \ ../../lib/jdk/test/lib/Container.java -requires.extraPropDefns.javacOpts = --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED +requires.extraPropDefns.javacOpts = \ + --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \ + --add-exports java.base/jdk.internal.misc=ALL-UNNAMED requires.extraPropDefns.vmOpts = \ -XX:+UnlockDiagnosticVMOptions \ -XX:+LogVMOutput -XX:-DisplayVMOutput -XX:LogFile=vmprops.flags.final.vm.log \ -XX:+PrintFlagsFinal \ -XX:+WhiteBoxAPI \ - --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED + --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \ + --add-exports java.base/jdk.internal.misc=ALL-UNNAMED requires.properties= \ sun.arch.data.model \ vm.simpleArch \ diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT index 91c44bc4d05..30e2f7cab41 100644 --- a/test/jdk/TEST.ROOT +++ b/test/jdk/TEST.ROOT @@ -74,16 +74,20 @@ requires.extraPropDefns.bootlibs = ../lib/jdk/test/whitebox requires.extraPropDefns.libs = \ ../lib/jdk/test/lib/Platform.java \ ../lib/jdk/test/lib/Container.java -requires.extraPropDefns.javacOpts = --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED +requires.extraPropDefns.javacOpts = \ + --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \ + --add-exports java.base/jdk.internal.misc=ALL-UNNAMED requires.extraPropDefns.vmOpts = \ -XX:+UnlockDiagnosticVMOptions \ -XX:+LogVMOutput -XX:-DisplayVMOutput -XX:LogFile=vmprops.flags.final.vm.log \ -XX:+PrintFlagsFinal \ -XX:+WhiteBoxAPI \ - --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED + --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \ + --add-exports java.base/jdk.internal.misc=ALL-UNNAMED requires.properties= \ sun.arch.data.model \ java.runtime.name \ + java.enablePreview \ vm.flagless \ vm.gc.G1 \ vm.gc.Serial \ diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java index 3b572c6581b..fddbb348517 100644 --- a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java +++ b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ * @bug 8245432 * @modules jdk.compiler * @library /test/lib + * @requires !java.enablePreview * @build jdk.test.lib.Utils * jdk.test.lib.compiler.CompilerUtils * @run testng PreviewHiddenClass diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 6f8beff8cf9..5f74ffa6ea6 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -50,6 +50,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; import jdk.internal.foreign.CABI; +import jdk.internal.misc.PreviewFeatures; import jdk.test.whitebox.code.Compiler; import jdk.test.whitebox.cpuinfo.CPUInfo; import jdk.test.whitebox.gc.GC; @@ -129,6 +130,7 @@ public class VMProps implements Callable> { map.put("vm.graal.enabled", this::isGraalEnabled); // jdk.hasLibgraal is true if the libgraal shared library file is present map.put("jdk.hasLibgraal", this::hasLibgraal); + map.put("java.enablePreview", this::isPreviewEnabled); map.put("vm.libgraal.jit", this::isLibgraalJIT); map.put("vm.compiler1.enabled", this::isCompiler1Enabled); map.put("vm.compiler2.enabled", this::isCompiler2Enabled); @@ -586,6 +588,9 @@ public class VMProps implements Callable> { return "" + Compiler.isC2Enabled(); } + protected String isPreviewEnabled() { + return "" + PreviewFeatures.isEnabled(); + } /** * A simple check for container support * diff --git a/test/langtools/TEST.ROOT b/test/langtools/TEST.ROOT index c6c79ac81df..9b1c5368e66 100644 --- a/test/langtools/TEST.ROOT +++ b/test/langtools/TEST.ROOT @@ -37,10 +37,16 @@ requires.extraPropDefns.bootlibs = ../lib/jdk/test/whitebox requires.extraPropDefns.libs = \ ../lib/jdk/test/lib/Platform.java \ ../lib/jdk/test/lib/Container.java -requires.extraPropDefns.javacOpts = --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED +requires.extraPropDefns.javacOpts = \ + --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \ + --add-exports java.base/jdk.internal.misc=ALL-UNNAMED requires.extraPropDefns.vmOpts = \ - -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI \ - --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED + -XX:+UnlockDiagnosticVMOptions \ + -XX:+LogVMOutput -XX:-DisplayVMOutput -XX:LogFile=vmprops.flags.final.vm.log \ + -XX:+PrintFlagsFinal \ + -XX:+WhiteBoxAPI \ + --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \ + --add-exports java.base/jdk.internal.misc=ALL-UNNAMED requires.properties= \ vm.continuations \ vm.debug