8299699: Test runtime/cds/appcds/WrongClasspath.java fails after JDK-8299329

[ashu-mehra]

Failure happens because TestCommon#patchJarForDynamicDump(String cp) expects the jar files passed in cp parameter are with absolute path. The new test case added for JDK 8299329 passed jar files using path relative to work dir.

        if (!firstJar.startsWith(expected)) {
            throw new RuntimeException("FIXME: jar file not at a supported location ('"
                                       + expected + "'): " + firstJar);
        }

This fix converts firstJar into real path using Path.toRealPath() before doing firstJar.startsWith(expected).
This way all relative paths are also converted to absolute paths before the check is performed.

I tested this fix by running WrongClasspath test with -Dtest.dynamic.cds.archive=true as:

$ java -jar /work/jtreg/build/images/jtreg/lib/jtreg.jar -Dtest.dynamic.cds.archive=true -jdk:/work/jdk/build/JDK-8299329-fd/images/jdk test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java

Signed-off-by: Ashutosh Mehra asmehra@redhat.com

---

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-8299699: Test runtime/cds/appcds/WrongClasspath.java fails after JDK-8299329

Reviewers

• Ioi Lam (@iklam - Reviewer)
• Calvin Cheung (@calvinccheung - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11882

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

Using diff file

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

[bridgekeeper]

👋 Welcome back ashu-mehra! 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]

@ashu-mehra The following label will be automatically applied to this pull request:

• hotspot-runtime

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 (3d9b330a)

[ashu-mehra]

@iklam can you please review this PR.

[iklam]

Looks good to me. I have tested locally and the test passed. I'm now running the related test tasks in our CI to make sure the patch works with the other tests as well.

[iklam]

Tests passed.

I think this qualifies as a Trivial change so only one reviewer is needed.

[calvinccheung]

I tested your patch by running the open/test/hotspot/jtreg:hotspot_appcds_dynamic test group with -Dtest.dynamic.cds.archive=true locally on linux-x64 and all 93 tests passed.

[ashu-mehra]

@iklam @calvinccheung thanks for testing the patch.

[ashu-mehra]

/integrate

[openjdk]

@ashu-mehra This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8299699: Test runtime/cds/appcds/WrongClasspath.java fails after JDK-8299329

Reviewed-by: iklam, ccheung

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 4 new commits pushed to the master branch:

• 8c70bf3: 8299544: Improve performance of CRC32C intrinsics (non-AVX-512) for small inputs
• d6e9f01: 8285416: [LOOM] Some nsk/jdi tests fail due to needing too many virtual threads
• ba03f42: 8299746: Accept unknown signatureAlgorithm in PKCS7 SignerInfo
• 3dcf700: 8299336: InputStream::DEFAULT_BUFFER_SIZE should be 16384

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@iklam, @calvinccheung) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[calvinccheung]

/sponsor

[openjdk]

@ashu-mehra
Your change (at version 3d9b330) is now ready to be sponsored by a Committer.

[openjdk]

Going to push as commit d6d6eb4.
Since your change was applied there have been 4 commits pushed to the master branch:

• 8c70bf3: 8299544: Improve performance of CRC32C intrinsics (non-AVX-512) for small inputs
• d6e9f01: 8285416: [LOOM] Some nsk/jdi tests fail due to needing too many virtual threads
• ba03f42: 8299746: Accept unknown signatureAlgorithm in PKCS7 SignerInfo
• 3dcf700: 8299336: InputStream::DEFAULT_BUFFER_SIZE should be 16384

Your commit was automatically rebased without conflicts.

[openjdk]

@calvinccheung @ashu-mehra Pushed as commit d6d6eb4.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.