8365436: ImageReaderTest fails when jmods directory not present

[david-beaumont]

Switched from TestSkippedException (not honoured by JUnit) to TestAbortedException (via Assumptions class) to avoid false negative test "failure". Note that now, the test is either shown as skipped, or passed, depending on which report is being looked at. Tweaked error message slightly since using an "exploded image" isn't the only cause.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8365436: ImageReaderTest fails when jmods directory not present (Bug - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26773/head:pull/26773
$ git checkout pull/26773

Update a local copy of the PR:
$ git checkout pull/26773
$ git pull https://git.openjdk.org/jdk.git pull/26773/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26773

View PR using the GUI difftool:
$ git pr show -t 26773

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26773.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back david-beaumont! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

[openjdk]

@david-beaumont The following label will be automatically applied to this pull request:

• core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (17a6b176)

[AlanBateman]

There is a jimage file, Helper.newHelper is returning null because there are no packaged modules in the runtime image (= no jmods directory).

In passing, tests.Helper is the supporting class for the jlink tests. We should rename it or create a sub-directory in test/jdk/tools/lib/tests as the location/naming just won't work for this very specific class.

[david-beaumont]

The other PR on the bug (https://github.com/openjdk/jdk/pull/26774/files) changes the comment.
Happy for a more specific wording though.
This PR is likely redundant now.

[jerboaa]

I'd suggest to make the test run on as many scenarios as possible. This patch seems to work for me on a JEP 493-enabled build:

diff --git a/test/jdk/jdk/internal/jimage/ImageReaderTest.java b/test/jdk/jdk/internal/jimage/ImageReaderTest.java
index 62281151126..14c5f8eac21 100644
--- a/test/jdk/jdk/internal/jimage/ImageReaderTest.java
+++ b/test/jdk/jdk/internal/jimage/ImageReaderTest.java
@@ -25,6 +25,7 @@
 import jdk.internal.jimage.ImageReader.Node;
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.util.JarBuilder;
+import jdk.tools.jlink.internal.LinkableRuntimeImage;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -55,6 +56,7 @@
  * @summary Tests for ImageReader.
  * @modules java.base/jdk.internal.jimage
  *          jdk.jlink/jdk.tools.jimage
+ *          jdk.jlink/jdk.tools.jlink.internal
  * @library /test/jdk/tools/lib
  *          /test/lib
  * @build tests.*
@@ -216,7 +218,8 @@ public String toString() {
     private static Helper getHelper() {
         Helper helper;
         try {
-            helper = Helper.newHelper();
+            boolean isLinkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
+            helper = Helper.newHelper(isLinkableRuntime);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

The comments seem wrong as Alan pointed out.

[jerboaa]

Suggested change

	helper = Helper.newHelper();
	boolean isLinkableRuntime = LinkableRuntimeImage.isLinkableRuntime();
	helper = Helper.newHelper(isLinkableRuntime);

This will make the test run (not abort) for JEP 493-enabled builds.

[david-beaumont]

Yes, this was done for https://github.com/openjdk/jdk/pull/26774/files once I knew about it and could patch in the extra modules line.

[jerboaa]

I'm not sure why you've created another PR for the same issue, but I think this should get closed.

[david-beaumont]

I'm closing this alternate PR, please review #26774 instead.