From a797ea69bc2852a843f2c8cc4d4fcd18f1468682 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 5 Dec 2023 18:16:51 +0100 Subject: [PATCH] Add @enablePreview for JImageValidator that uses classfile API --- test/jdk/tools/jlink/JmodLess/AddOptionsTest.java | 1 + test/jdk/tools/jlink/JmodLess/BasicJlinkTest.java | 1 + test/jdk/tools/jlink/JmodLess/CustomModuleJlinkTest.java | 1 + test/jdk/tools/jlink/JmodLess/GenerateJLIClassesTest.java | 1 + test/jdk/tools/jlink/JmodLess/JavaSEReproducibleTest.java | 1 + test/jdk/tools/jlink/JmodLess/ModifiedFilesExitTest.java | 1 + test/jdk/tools/jlink/JmodLess/ModifiedFilesWarningTest.java | 1 + test/jdk/tools/jlink/JmodLess/MultiHopTest.java | 1 + test/jdk/tools/jlink/JmodLess/PackagedModulesVsJmodLessTest.java | 1 + test/jdk/tools/jlink/JmodLess/SaveJlinkOptsTest.java | 1 + test/jdk/tools/jlink/JmodLess/SystemModulesTest.java | 1 + test/jdk/tools/jlink/JmodLess/SystemModulesTest2.java | 1 + 12 files changed, 12 insertions(+) diff --git a/test/jdk/tools/jlink/JmodLess/AddOptionsTest.java b/test/jdk/tools/jlink/JmodLess/AddOptionsTest.java index 10787f9259d9e..1cfe936584f11 100644 --- a/test/jdk/tools/jlink/JmodLess/AddOptionsTest.java +++ b/test/jdk/tools/jlink/JmodLess/AddOptionsTest.java @@ -33,6 +33,7 @@ * @summary Test --add-options jlink plugin in jmod-less mode * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/BasicJlinkTest.java b/test/jdk/tools/jlink/JmodLess/BasicJlinkTest.java index 60297617a4663..1784eb0f806d8 100644 --- a/test/jdk/tools/jlink/JmodLess/BasicJlinkTest.java +++ b/test/jdk/tools/jlink/JmodLess/BasicJlinkTest.java @@ -32,6 +32,7 @@ * @summary Test basic jmod-less jlinking * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/CustomModuleJlinkTest.java b/test/jdk/tools/jlink/JmodLess/CustomModuleJlinkTest.java index ecfecf019fb80..6c9d5e057bee0 100644 --- a/test/jdk/tools/jlink/JmodLess/CustomModuleJlinkTest.java +++ b/test/jdk/tools/jlink/JmodLess/CustomModuleJlinkTest.java @@ -32,6 +32,7 @@ * @summary Test jmod-less jlink with a custom module * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/GenerateJLIClassesTest.java b/test/jdk/tools/jlink/JmodLess/GenerateJLIClassesTest.java index 9f0fc09a4fb21..b9dd800e81b77 100644 --- a/test/jdk/tools/jlink/JmodLess/GenerateJLIClassesTest.java +++ b/test/jdk/tools/jlink/JmodLess/GenerateJLIClassesTest.java @@ -32,6 +32,7 @@ * @summary Verify JLI class generation in run-time image link mode * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/JavaSEReproducibleTest.java b/test/jdk/tools/jlink/JmodLess/JavaSEReproducibleTest.java index 8714576877e5e..0e14a0ac50e28 100644 --- a/test/jdk/tools/jlink/JmodLess/JavaSEReproducibleTest.java +++ b/test/jdk/tools/jlink/JmodLess/JavaSEReproducibleTest.java @@ -31,6 +31,7 @@ * @summary Test reproducibility of jmod-less jlink of java.se * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/ModifiedFilesExitTest.java b/test/jdk/tools/jlink/JmodLess/ModifiedFilesExitTest.java index 2c98504ca9f95..4eb22adc98841 100644 --- a/test/jdk/tools/jlink/JmodLess/ModifiedFilesExitTest.java +++ b/test/jdk/tools/jlink/JmodLess/ModifiedFilesExitTest.java @@ -9,6 +9,7 @@ * @summary Verify jlink fails by default when jlinking in jmod-less mode and files have been changed * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/ModifiedFilesWarningTest.java b/test/jdk/tools/jlink/JmodLess/ModifiedFilesWarningTest.java index d2a6a84cce2b5..0f221efe1f4ab 100644 --- a/test/jdk/tools/jlink/JmodLess/ModifiedFilesWarningTest.java +++ b/test/jdk/tools/jlink/JmodLess/ModifiedFilesWarningTest.java @@ -31,6 +31,7 @@ * @summary Verify warnings are being produced when jlinking in jmod-less mode and files have been changed * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/MultiHopTest.java b/test/jdk/tools/jlink/JmodLess/MultiHopTest.java index be6d8bacd0951..e41a2890b0f2b 100644 --- a/test/jdk/tools/jlink/JmodLess/MultiHopTest.java +++ b/test/jdk/tools/jlink/JmodLess/MultiHopTest.java @@ -32,6 +32,7 @@ * @summary Verify that a jlink unsing the run-image only is single-hop only * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/PackagedModulesVsJmodLessTest.java b/test/jdk/tools/jlink/JmodLess/PackagedModulesVsJmodLessTest.java index 93495afc9cf79..aa319c6c770e4 100644 --- a/test/jdk/tools/jlink/JmodLess/PackagedModulesVsJmodLessTest.java +++ b/test/jdk/tools/jlink/JmodLess/PackagedModulesVsJmodLessTest.java @@ -41,6 +41,7 @@ * @summary Compare packaged-modules jlink with a jmod-less jlink to produce the same result * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/SaveJlinkOptsTest.java b/test/jdk/tools/jlink/JmodLess/SaveJlinkOptsTest.java index 27a6365f8d508..86c0dddcaa29c 100644 --- a/test/jdk/tools/jlink/JmodLess/SaveJlinkOptsTest.java +++ b/test/jdk/tools/jlink/JmodLess/SaveJlinkOptsTest.java @@ -35,6 +35,7 @@ * @summary Test --save-jlink-argfiles plugin in jmod-less mode * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/SystemModulesTest.java b/test/jdk/tools/jlink/JmodLess/SystemModulesTest.java index 2467fc76abd88..0568f2c936b98 100644 --- a/test/jdk/tools/jlink/JmodLess/SystemModulesTest.java +++ b/test/jdk/tools/jlink/JmodLess/SystemModulesTest.java @@ -33,6 +33,7 @@ * @summary Test appropriate handling of generated SystemModules* classes in run-time image link mode * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jlink/JmodLess/SystemModulesTest2.java b/test/jdk/tools/jlink/JmodLess/SystemModulesTest2.java index 5ceb2158196b9..202ae637e94c3 100644 --- a/test/jdk/tools/jlink/JmodLess/SystemModulesTest2.java +++ b/test/jdk/tools/jlink/JmodLess/SystemModulesTest2.java @@ -36,6 +36,7 @@ * not consistently enabled/disabled. * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g) * @library ../../lib /test/lib + * @enablePreview * @modules java.base/jdk.internal.classfile * java.base/jdk.internal.jimage * jdk.jlink/jdk.tools.jlink.internal