8311302: Implement JEP 493: Linking Run-Time Images without JMODs

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JRTArchive.java

@@ -127,9 +127,6 @@ public Stream<Entry> entries() {
             collectFiles();
         } catch (IOException e) {
             throw new UncheckedIOException(e);
-        } catch (RuntimeImageLinkException e) {
-            // populate modified files exception
-            throw e;
         }
         return files.stream().map(JRTFile::toEntry);
     }

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/RuntimeImageLinkException.java

@@ -25,6 +25,8 @@
 
 package jdk.tools.jlink.internal.runtimelink;
 
+import java.util.Objects;
+
 /**
  * Exception thrown when linking from the run-time image
  */
@@ -41,8 +43,8 @@ public static enum Reason {
     private final Reason reason;
 
     public RuntimeImageLinkException(String file, Reason reason) {
-        this.file = file;
-        this.reason = reason;
+        this.file = Objects.requireNonNull(file);
+        this.reason = Objects.requireNonNull(reason);
     }
 
     public String getFile() {

src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties

@@ -123,7 +123,7 @@ err.runtime.link.not.linkable.runtime=This JDK does not support linking from the
 err.runtime.link.jdk.jlink.prohibited=This JDK does not contain packaged modules\
 \ and cannot be used to create another image with the jdk.jlink module
 err.runtime.link.packaged.mods=This JDK has no packaged modules.\
-\ --keep-packaged-modules is not supported.
+\ --keep-packaged-modules is not supported
 err.runtime.link.modified.file={0} has been modified
 err.runtime.link.patched.module=File {0} not found in the modules image.\
 \ --patch-module is not supported when linking from the run-time image

test/jdk/tools/jlink/JLinkDedupTestBatchSizeOne.java

@@ -27,29 +27,12 @@
 import java.nio.file.Paths;
 
 import jdk.test.lib.compiler.CompilerUtils;
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
 import tests.JImageGenerator;
 
-/*
- * @test id=packaged_modules
- * @summary Make sure that modules can be linked using jlink
- * and deduplication works correctly when creating sub methods
- * @bug 8311591
- * @library /test/lib
- *          ../lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jmod
- *          jdk.jlink/jdk.tools.jimage
- *          jdk.compiler
- * @build tests.* JLinkDedupTestBatchSizeOne jdk.test.lib.compiler.CompilerUtils
- * @requires jlink.packagedModules
- * @run main/othervm -Xmx1g -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLinkDedupTestBatchSizeOne false
- */
 
 /*
- * @test id=linkable_jdk_runtimes
+ * @test
  * @summary Make sure that modules can be linked using jlink
  * and deduplication works correctly when creating sub methods
  * @bug 8311591
@@ -62,9 +45,8 @@
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
- * @requires (jlink.runtime.linkable & !jlink.packagedModules)
  * @build tests.* JLinkDedupTestBatchSizeOne jdk.test.lib.compiler.CompilerUtils
- * @run main/othervm -Xmx1g -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLinkDedupTestBatchSizeOne true
+ * @run main/othervm -Xmx1g -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLinkDedupTestBatchSizeOne
  */
 public class JLinkDedupTestBatchSizeOne {
 
@@ -101,13 +83,10 @@ public static void compileAll(boolean linkableRuntime) throws Throwable {
     }
 
     public static void main(String[] args) throws Throwable {
-        if (args.length != 1) {
-            throw new AssertionError("Wrong number of arguments for the test!");
-        }
-        boolean linkableRuntime = Boolean.parseBoolean(args[0]);
+        boolean linkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
         System.out.println("Running test on " +
-                               (linkableRuntime ? "a linkable JDK runtime" :
-                                   "packaged modules") + ".");
+                            (linkableRuntime ? "enabled" : "disabled") +
+                            " capability of linking from the run-time image.");
         compileAll(linkableRuntime);
         Path image = Paths.get("bug8311591");
 

test/jdk/tools/jlink/JLinkHelpCapabilityTest.java

@@ -25,18 +25,14 @@
 import java.io.StringWriter;
 import java.util.spi.ToolProvider;
 
-/*
- * @test id=run-time-image-cap-yes
- * @summary Test jlink --help for capability output (true)
- * @requires (vm.compMode != "Xcomp" & jlink.runtime.linkable)
- * @run main/othervm -Duser.language=en JLinkHelpCapabilityTest true
- */
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
 
 /*
- * @test id=run-time-image-cap-no
- * @summary Test jlink --help for capability output (false)
- * @requires (vm.compMode != "Xcomp" & !jlink.runtime.linkable)
- * @run main/othervm -Duser.language=en JLinkHelpCapabilityTest false
+ * @test
+ * @summary Test jlink --help for capability output
+ * @modules jdk.jlink/jdk.tools.jlink.internal
+ * @requires vm.compMode != "Xcomp"
+ * @run main/othervm -Duser.language=en JLinkHelpCapabilityTest
  */
 public class JLinkHelpCapabilityTest {
     static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink")
@@ -45,7 +41,7 @@ public class JLinkHelpCapabilityTest {
         );
 
     public static void main(String[] args) throws Exception {
-        boolean runtimeLinkCap = Boolean.parseBoolean(args[0]);
+        boolean runtimeLinkCap = LinkableRuntimeImage.isLinkableRuntime();
         String capabilities = String.format("Linking from run-time image %s",
                                             runtimeLinkCap ? "enabled" : "disabled");
         {

test/jdk/tools/jlink/plugins/GenerateJLIClassesPluginTest.java

@@ -38,29 +38,15 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
 import tests.Helper;
 import tests.JImageGenerator;
 import tests.JImageValidator;
 import tests.Result;
 
-/*
- * @test id=packaged_modules
- * @bug 8252919 8327499
- * @library ../../lib
- * @summary Test --generate-jli-classes plugin
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.internal.plugins
- *          jdk.jlink/jdk.tools.jmod
- *          jdk.jlink/jdk.tools.jimage
- * @requires jlink.packagedModules
- * @build tests.*
- * @run testng/othervm -DlinkableRuntime=false GenerateJLIClassesPluginTest
- */
 
 /*
- * @test id=linkable_jdk_runtimes
+ * @test
  * @bug 8252919 8327499
  * @library ../../lib
  * @summary Test --generate-jli-classes plugin
@@ -70,26 +56,29 @@
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
- * @requires (jlink.runtime.linkable & !jlink.packagedModules)
  * @build tests.*
- * @run testng/othervm -DlinkableRuntime=true GenerateJLIClassesPluginTest
+ * @run testng/othervm GenerateJLIClassesPluginTest
  */
 public class GenerateJLIClassesPluginTest {
 
-    private static final String LINKABLE_RUNTIME_PROP = "linkableRuntime";
     private static Helper helper;
 
     @BeforeTest
     public static void setup() throws Exception {
-        boolean isLinkableRuntime = Boolean.getBoolean(LINKABLE_RUNTIME_PROP);
-        System.out.println("Tests run on " +
-                           (isLinkableRuntime ? "linkable JDK runtime." : "packaged modules."));
+        boolean isLinkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
+        System.out.println("DEBUG: Tests run on " +
+                           (isLinkableRuntime ? "enabled" : "disabled") +
+                           " capability of linking from the run-time image.");
+        System.out.println("DEBUG: default module-path, 'jmods', " +
+                           (Helper.jdkHasPackagedModules() ? "" : "NOT ") +
+                           "present.");
         helper = Helper.newHelper(isLinkableRuntime);
         if (helper == null) {
+            // In case of no linkable run-time image and also no packaged
+            // modules, helper will be null.
             System.err.println("Test not run");
             return;
         }
-        helper.generateDefaultModules();
     }
 
     @Test
@@ -100,7 +89,6 @@ public static void testSpecies()  throws IOException {
         String fileString = "[SPECIES_RESOLVE] java.lang.invoke.BoundMethodHandle$Species_" + species + " (salvaged)\n";
         Files.write(baseFile, fileString.getBytes(Charset.defaultCharset()));
         Result result = JImageGenerator.getJLinkTask()
-                .modulePath(helper.defaultModulePath())
                 .output(helper.createNewImageDir("generate-jli-file"))
                 .option("--generate-jli-classes=@" + baseFile.toString())
                 .addMods("java.base")
@@ -126,7 +114,6 @@ public static void testInvalidSignatures() throws IOException {
             fileString = "[LF_RESOLVE] java.lang.invoke.DirectMethodHandle$Holder invokeVirtual L_L (success)\n";
             Files.write(failFile, fileString.getBytes(Charset.defaultCharset()));
             Result result = JImageGenerator.getJLinkTask()
-                    .modulePath(helper.defaultModulePath())
                     .output(helper.createNewImageDir("invalid-signature"))
                     .option("--generate-jli-classes=@" + failFile.toString())
                     .addMods("java.base")
@@ -139,7 +126,6 @@ public static void testInvalidSignatures() throws IOException {
     @Test
     public static void nonExistentTraceFile() throws IOException {
         Result result = JImageGenerator.getJLinkTask()
-                .modulePath(helper.defaultModulePath())
                 .output(helper.createNewImageDir("non-existent-tracefile"))
                 .option("--generate-jli-classes=@NON_EXISTENT_FILE")
                 .addMods("java.base")
@@ -155,7 +141,6 @@ public static void testInvokers() throws IOException {
         Path invokersTrace = Files.createTempFile("invokers", "trace");
         Files.writeString(invokersTrace, fileString, Charset.defaultCharset());
         Result result = JImageGenerator.getJLinkTask()
-                .modulePath(helper.defaultModulePath())
                 .output(helper.createNewImageDir("jli-invokers"))
                 .option("--generate-jli-classes=@" + invokersTrace.toString())
                 .addMods("java.base")
@@ -204,4 +189,5 @@ private static List<String> classFilesForSpecies(Collection<String> species) {
                 .map(s -> "/java.base/java/lang/invoke/BoundMethodHandle$Species_" + s + ".class")
                 .collect(Collectors.toList());
     }
+
 }

test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java

@@ -28,6 +28,7 @@
 import java.util.Locale;
 import java.util.stream.Collectors;
 
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
 import jdk.tools.jlink.internal.TaskHelper;
 import jdk.tools.jlink.internal.plugins.PluginsResourceBundle;
 import jdk.tools.jlink.plugin.PluginException;
@@ -36,36 +37,15 @@
 import tests.JImageValidator;
 import tests.Result;
 
-/*
- * @test id=packaged_modules
- * @bug 8152143 8152704 8155649 8165804 8185841 8176841 8190918
- *      8179071 8202537 8221432 8222098 8251317 8258794 8265315
- *      8296248 8306116 8174269 8333582
- * @summary IncludeLocalesPlugin tests
- * @author Naoto Sato
- * @requires (jlink.packagedModules & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.internal.plugins
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jmod
- *          jdk.jlink/jdk.tools.jimage
- *          jdk.compiler
- * @build tests.*
- * @build tools.jlink.plugins.GetAvailableLocales
- * @run main/othervm/timeout=180 -Xmx1g IncludeLocalesPluginTest false
- */
 
 /*
- * @test id=linkable_jdk_runtimes
+ * @test
  * @bug 8152143 8152704 8155649 8165804 8185841 8176841 8190918
  *      8179071 8202537 8221432 8222098 8251317 8258794 8265315
  *      8296248 8306116 8174269
  * @summary IncludeLocalesPlugin tests
  * @author Naoto Sato
- * @requires (jlink.runtime.linkable & !jlink.packagedModules & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -77,7 +57,7 @@
  *          jdk.compiler
  * @build tests.*
  * @build tools.jlink.plugins.GetAvailableLocales
- * @run main/othervm/timeout=180 -Xmx1g IncludeLocalesPluginTest true
+ * @run main/othervm/timeout=180 -Xmx1g IncludeLocalesPluginTest
  */
 public class IncludeLocalesPluginTest {
 
@@ -435,35 +415,31 @@ public class IncludeLocalesPluginTest {
     };
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new RuntimeException("Usage: " +
-                                       IncludeLocalesPluginTest.class.getSimpleName() +
-                                       " {true,false}");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
+        boolean isLinkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
         System.out.println("Running test on " +
-                           (isLinkableRuntime ? "linkable JDK runtime." : "packaged modules."));
+                           (isLinkableRuntime ? "enabled" : "disabled") +
+                           " capability of linking from the run-time image.");
+        System.out.println("Default module-path, 'jmods', " +
+                           (Helper.jdkHasPackagedModules() ? "" : "NOT ") +
+                           "present.");
 
         helper = Helper.newHelper(isLinkableRuntime);
         if (helper == null) {
             throw new RuntimeException("Helper could not be initialized");
         }
-        helper.generateDefaultModules();
 
         for (Object[] data : testData) {
             // create image for each test data
             Result result;
             if (data[INCLUDE_LOCALES_OPTION].toString().isEmpty()) {
                 System.out.println("Invoking jlink with no --include-locales option");
                 result = JImageGenerator.getJLinkTask()
-                    .modulePath(helper.defaultModulePath())
                     .output(helper.createNewImageDir(moduleName))
                     .addMods((String) data[ADDMODS_OPTION])
                     .call();
             } else {
                 System.out.println("Invoking jlink with \"" + data[INCLUDE_LOCALES_OPTION] + "\"");
                 result = JImageGenerator.getJLinkTask()
-                    .modulePath(helper.defaultModulePath())
                     .output(helper.createNewImageDir(moduleName))
                     .addMods((String) data[ADDMODS_OPTION])
                     .option((String) data[INCLUDE_LOCALES_OPTION])

test/jdk/tools/jlink/runtimeImage/AbstractLinkableRuntimeTest.java

@@ -41,6 +41,7 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
 import tests.Helper;
 import tests.JImageGenerator;
 import tests.JImageGenerator.JLinkTask;
@@ -50,7 +51,8 @@ public abstract class AbstractLinkableRuntimeTest {
 
     protected static final boolean DEBUG = true;
 
-    public void run(boolean isLinkableRuntime) throws Exception {
+    public void run() throws Exception {
+        boolean isLinkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
         Helper helper = Helper.newHelper(isLinkableRuntime);
         if (helper == null) {
             System.err.println(AbstractLinkableRuntimeTest.class.getSimpleName() +

test/jdk/tools/jlink/runtimeImage/AddOptionsTest.java

@@ -29,9 +29,9 @@
 import tests.Helper;
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Test --add-options jlink plugin when linking from the run-time image
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -40,32 +40,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g AddOptionsTest true
- */
-
-/*
- * @test id=default_build
- * @summary Test --add-options jlink plugin when linking from the run-time image
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g AddOptionsTest false
+ * @run main/othervm -Xmx1g AddOptionsTest
  */
 public class AddOptionsTest extends AbstractLinkableRuntimeTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         AddOptionsTest test = new AddOptionsTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     @Override

test/jdk/tools/jlink/runtimeImage/BasicJlinkMissingJavaBase.java

@@ -29,10 +29,10 @@
 
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Test basic linking from the run-time image with java.base.jmod missing
  *          but java.xml.jmod present. It should link from the run-time image without errors.
- * @requires (jlink.packagedModules & jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (jlink.packagedModules & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -41,23 +41,7 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g BasicJlinkMissingJavaBase true
- */
-
-/*
- * @test id=default_build
- * @summary Test basic linking from the run-time image with java.base.jmod missing
- *          but java.xml.jmod present. It should link from the run-time image without errors.
- * @requires (jlink.packagedModules & !jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g BasicJlinkMissingJavaBase false
+ * @run main/othervm -Xmx1g BasicJlinkMissingJavaBase
  */
 public class BasicJlinkMissingJavaBase extends AbstractLinkableRuntimeTest {
 
@@ -81,12 +65,8 @@ private Path createJavaXMLRuntimeLink(Helper helper, String name, boolean isLink
     }
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         BasicJlinkMissingJavaBase test = new BasicJlinkMissingJavaBase();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
 }

test/jdk/tools/jlink/runtimeImage/BasicJlinkTest.java

@@ -28,24 +28,9 @@
 
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Test basic linking from the run-time image
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g BasicJlinkTest true
- */
-
-/*
- * @test id=default_build
- * @summary Test basic linking from the run-time image
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -77,12 +62,8 @@ private Path createJavaBaseRuntimeLink(Helper helper, String name, boolean isLin
     }
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         BasicJlinkTest test = new BasicJlinkTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
 }

test/jdk/tools/jlink/runtimeImage/CustomModuleJlinkTest.java

@@ -28,9 +28,9 @@
 
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Test jmod-less jlink with a custom module
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -39,32 +39,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g CustomModuleJlinkTest true
- */
-
-/*
- * @test id=default_build
- * @summary Test jmod-less jlink with a custom module
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g CustomModuleJlinkTest false
+ * @run main/othervm -Xmx1g CustomModuleJlinkTest
  */
 public class CustomModuleJlinkTest extends AbstractLinkableRuntimeTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         CustomModuleJlinkTest test = new CustomModuleJlinkTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     @Override

test/jdk/tools/jlink/runtimeImage/GenerateJLIClassesTest.java

@@ -28,9 +28,9 @@
 import tests.Helper;
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Verify JLI class generation in run-time image link mode
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -39,32 +39,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g GenerateJLIClassesTest true
- */
-
-/*
- * @test id=default_build
- * @summary Verify JLI class generation in run-time image link mode
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g GenerateJLIClassesTest false
+ * @run main/othervm -Xmx1g GenerateJLIClassesTest
  */
 public class GenerateJLIClassesTest extends AbstractLinkableRuntimeTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         GenerateJLIClassesTest test = new GenerateJLIClassesTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     /*

test/jdk/tools/jlink/runtimeImage/JavaSEReproducibleTest.java

@@ -26,27 +26,12 @@
 
 import tests.Helper;
 
-/*
- * @test id=linkable_runtime
- * @summary Test reproducibility of linking an java.se image using the run-time
- *          image.
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g JavaSEReproducibleTest true
- */
 
 /*
- * @test id=default_build
+ * @test
  * @summary Test reproducibility of linking an java.se image using the run-time
  *          image.
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -55,17 +40,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g JavaSEReproducibleTest false
+ * @run main/othervm -Xmx1g JavaSEReproducibleTest
  */
 public class JavaSEReproducibleTest extends AbstractLinkableRuntimeTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         JavaSEReproducibleTest test = new JavaSEReproducibleTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     @Override

test/jdk/tools/jlink/runtimeImage/KeepPackagedModulesFailTest.java

@@ -29,10 +29,10 @@
 
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Verify that jlink with an empty module path, but trying to use
  *          --keep-packaged-modules fails as expected.
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -41,33 +41,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g KeepPackagedModulesFailTest true
- */
-
-/*
- * @test id=default_build
- * @summary Verify that jlink with an empty module path, but trying to use
- *          --keep-packaged-modules fails as expected.
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g KeepPackagedModulesFailTest false
+ * @run main/othervm -Xmx1g KeepPackagedModulesFailTest
  */
 public class KeepPackagedModulesFailTest extends AbstractLinkableRuntimeTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         KeepPackagedModulesFailTest test = new KeepPackagedModulesFailTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     @Override

test/jdk/tools/jlink/runtimeImage/ModifiedFilesExitTest.java

@@ -28,10 +28,10 @@
 import tests.Helper;
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Verify jlink fails by default when linking from the run-time image
  *          and files have been modified
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -40,33 +40,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g ModifiedFilesExitTest true
- */
-
-/*
- * @test id=default_build
- * @summary Verify jlink fails by default when linking from the run-time image
- *          and files have been modified
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g ModifiedFilesExitTest false
+ * @run main/othervm -Xmx1g ModifiedFilesExitTest
  */
 public class ModifiedFilesExitTest extends ModifiedFilesTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         ModifiedFilesExitTest test = new ModifiedFilesExitTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     @Override

test/jdk/tools/jlink/runtimeImage/ModifiedFilesWarningTest.java

@@ -27,10 +27,10 @@
 import tests.Helper;
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Verify warnings are being produced when linking from the run-time
  *          image and files have been modified
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -39,35 +39,15 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g ModifiedFilesWarningTest true
- */
-
-/*
- * @test id=default_build
- * @summary Verify warnings are being produced when linking from the run-time
- *          image and files have been modified
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g ModifiedFilesWarningTest false
+ * @run main/othervm -Xmx1g ModifiedFilesWarningTest
  */
 public class ModifiedFilesWarningTest extends ModifiedFilesTest {
 
     protected static final String IGNORE_MODIFIED_RUNTIME_OPT = "--ignore-modified-runtime";
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         ModifiedFilesWarningTest test = new ModifiedFilesWarningTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     @Override

test/jdk/tools/jlink/runtimeImage/MultiHopTest.java

@@ -27,25 +27,11 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import tests.Helper;
 
-/*
- * @test id=linkable_runtime
- * @summary Verify that a jlink using the run-time image cannot include jdk.jlink
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g MultiHopTest true
- */
 
 /*
- * @test id=default_build
+ * @test
  * @summary Verify that a jlink using the run-time image cannot include jdk.jlink
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -54,7 +40,7 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g MultiHopTest false
+ * @run main/othervm -Xmx1g MultiHopTest
  */
 public class MultiHopTest extends AbstractLinkableRuntimeTest {
 
@@ -100,12 +86,8 @@ private Path createJDKJlinkJmodLess(Helper helper, String name, boolean isLinkab
     }
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         MultiHopTest test = new MultiHopTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
 }

test/jdk/tools/jlink/runtimeImage/PackagedModulesVsRuntimeImageLinkTest.java

@@ -35,27 +35,12 @@
 import tests.Helper;
 import tests.JImageGenerator;
 
-/*
- * @test id=linkable_runtime
- * @summary Compare packaged-modules jlink with a run-time image based jlink to
- *          produce the same result
- * @requires (jlink.packagedModules & jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g PackagedModulesVsRuntimeImageLinkTest true
- */
 
 /*
- * @test id=default_build
+ * @test
  * @summary Compare packaged-modules jlink with a run-time image based jlink to
  *          produce the same result
- * @requires (jlink.packagedModules & !jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (jlink.packagedModules & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -64,17 +49,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g PackagedModulesVsRuntimeImageLinkTest false
+ * @run main/othervm -Xmx1g PackagedModulesVsRuntimeImageLinkTest
  */
 public class PackagedModulesVsRuntimeImageLinkTest extends AbstractLinkableRuntimeTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         PackagedModulesVsRuntimeImageLinkTest test = new PackagedModulesVsRuntimeImageLinkTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     @Override

test/jdk/tools/jlink/runtimeImage/PatchedJDKModuleJlinkTest.java

@@ -31,9 +31,9 @@
 
 
 /*
- * @test id=linkable_runtime
+ * @test
  * @summary Test run-time link with --patch-module. Expect failure.
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -42,22 +42,7 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g PatchedJDKModuleJlinkTest true
- */
-
-/*
- * @test id=default_build
- * @summary Test run-time link with --patch-module. Expect failure.
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g PatchedJDKModuleJlinkTest false
+ * @run main/othervm -Xmx1g PatchedJDKModuleJlinkTest
  */
 public class PatchedJDKModuleJlinkTest extends AbstractLinkableRuntimeTest {
 
@@ -132,12 +117,8 @@ private Path createRuntimeLinkImage(Helper helper, String name, boolean isLinkab
     }
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         PatchedJDKModuleJlinkTest test = new PatchedJDKModuleJlinkTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
 }

test/jdk/tools/jlink/runtimeImage/SystemModulesTest.java

@@ -28,25 +28,11 @@
 import tests.Helper;
 import tests.JImageValidator;
 
-/*
- * @test id=linkable_runtime
- * @summary Test appropriate handling of generated SystemModules* classes in run-time image link mode
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g SystemModulesTest true
- */
 
 /*
- * @test id=default_build
+ * @test
  * @summary Test appropriate handling of generated SystemModules* classes in run-time image link mode
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -55,17 +41,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g SystemModulesTest false
+ * @run main/othervm -Xmx1g SystemModulesTest
  */
 public class SystemModulesTest extends AbstractLinkableRuntimeTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         SystemModulesTest test = new SystemModulesTest();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     /*

test/jdk/tools/jlink/runtimeImage/SystemModulesTest2.java

@@ -28,27 +28,12 @@
 import tests.Helper;
 import tests.JImageValidator;
 
-/*
- * @test id=linkable_runtime
- * @summary Test disabled SystemModulesPlugin in run-time image link mode. Expect
- *          generated classes to not be there.
- * @requires (jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
- * @library ../../lib /test/lib
- * @enablePreview
- * @modules java.base/jdk.internal.jimage
- *          jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink.plugin
- *          jdk.jlink/jdk.tools.jimage
- * @build tests.* jdk.test.lib.process.OutputAnalyzer
- *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g SystemModulesTest2 true
- */
 
 /*
- * @test id=default_build
+ * @test
  * @summary Test disabled SystemModulesPlugin in run-time image link mode. Expect
  *          generated classes to not be there.
- * @requires (!jlink.runtime.linkable & vm.compMode != "Xcomp" & os.maxMemory >= 2g)
+ * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
  * @library ../../lib /test/lib
  * @enablePreview
  * @modules java.base/jdk.internal.jimage
@@ -57,17 +42,13 @@
  *          jdk.jlink/jdk.tools.jimage
  * @build tests.* jdk.test.lib.process.OutputAnalyzer
  *        jdk.test.lib.process.ProcessTools
- * @run main/othervm -Xmx1g SystemModulesTest2 false
+ * @run main/othervm -Xmx1g SystemModulesTest2
  */
 public class SystemModulesTest2 extends AbstractLinkableRuntimeTest {
 
     public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new IllegalArgumentException("Wrong number of passed arguments");
-        }
-        boolean isLinkableRuntime = Boolean.parseBoolean(args[0]);
         SystemModulesTest2 test = new SystemModulesTest2();
-        test.run(isLinkableRuntime);
+        test.run();
     }
 
     @Override

test/jdk/tools/lib/tests/Helper.java

@@ -72,14 +72,18 @@ public static Helper newHelper() throws IOException {
     }
 
     public static Helper newHelper(boolean linkableRuntime) throws IOException {
-        if (!linkableRuntime && !Files.exists(JDK_HOME.resolve("jmods"))) {
+        if (!linkableRuntime && !jdkHasPackagedModules()) {
             // Skip test if the jmods directory is missing (e.g. exploded image)
             System.err.println("Test not run, NO jmods directory");
             return null;
         }
         return new Helper(JDK_HOME, linkableRuntime);
     }
 
+    public static boolean jdkHasPackagedModules() {
+        return Files.exists(JDK_HOME.resolve("jmods"));
+    }
+
     private Helper(Path jdkHome, boolean linkableRuntime) throws IOException {
         this.linkableRuntime = linkableRuntime;
         this.stdjmods = jdkHome.resolve("jmods").normalize();

test/jtreg-ext/requires/VMProps.java

@@ -143,7 +143,6 @@ public Map<String, String> call() {
         map.put("jdk.containerized", this::jdkContainerized);
         map.put("vm.flagless", this::isFlagless);
         map.put("jdk.foreign.linker", this::jdkForeignLinker);
-        map.put("jlink.runtime.linkable", this::runtimeLinkable);
         map.put("jlink.packagedModules", this::packagedModules);
         vmGC(map); // vm.gc.X = true/false
         vmGCforCDS(map); // may set vm.gc
@@ -737,31 +736,6 @@ private String packagedModules() {
         }
     }
 
-    private String runtimeLinkable() {
-        // jdk.jlink module has the following resource indicating a runtime-linkable
-        // image. It's the diff file for runtime linking of the java.base module.
-        String linkableRuntimeResource = "jdk/tools/jlink/internal/runtimelink/diff_java.base";
-        try {
-            ModuleFinder finder = ModuleFinder.ofSystem();
-            Optional<ModuleReference> ref = finder.find("jdk.jlink");
-            if (ref.isEmpty()) {
-                // No jdk.jlink in the current image
-                return Boolean.FALSE.toString();
-            }
-            try (ModuleReader reader = ref.get().open()) {
-                Optional<InputStream> inOpt = reader.open(linkableRuntimeResource);
-                if (inOpt.isPresent()) {
-                    inOpt.get().close();
-                    return Boolean.TRUE.toString();
-                } else {
-                    return Boolean.FALSE.toString();
-                }
-            }
-        } catch (Throwable t) {
-            return Boolean.FALSE.toString();
-        }
-    }
-
     /**
      * Checks if we are in <i>almost</i> out-of-box configuration, i.e. the flags
      * which JVM is started with don't affect its behavior "significantly".