Skip to content

Conversation

@magicus
Copy link
Member

@magicus magicus commented Apr 2, 2025

JDK-8348905 added the possibility to set JDK_FOR_COMPILE on the command line to pass the -compilejdk: argument to jtreg. Unfortunately the way it did this meant that -compilejdk: were always passed, so trying to set it separately in JAVAOPTIONS failed due to a duplicate argument error.

This PR will instead only set -compilejdk: if JDK_FOR_COMPILE is given on the command line.


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-8349075: Once again allow -compilejdk in JAVA_OPTIONS (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24386

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 2, 2025

👋 Welcome back ihse! 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
Copy link

openjdk bot commented Apr 2, 2025

@magicus 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:

8349075: Once again allow -compilejdk in JAVA_OPTIONS

Reviewed-by: rehn, erikj

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 31 new commits pushed to the master branch:

  • 1c2a553: 8327858: Improve spliterator and forEach for single-element immutable collections
  • a449aee: 8350704: Create tests to ensure the failure behavior of core reflection APIs
  • 57df89c: 8353684: [BACKOUT] j.u.l.Handler classes create deadlock risk via synchronized publish() method
  • ebcb9a8: 8349206: j.u.l.Handler classes create deadlock risk via synchronized publish() method
  • d894b78: 8353588: [REDO] DaCapo xalan performance with -XX:+UseObjectMonitorTable
  • db08726: 8352966: Opensource Several Font related tests - Batch 2
  • 6b7b324: 8351431: Type annotations on new class creation expressions can't be retrieved
  • 64b691a: 8271870: G1: Add objArray splitting when scanning object with evacuation failure
  • b428cda: 8349686: [s390x] C1: Improve Class.isInstance intrinsic
  • 70e3250: 8352419: Test tools/jpackage/share/ErrorTest.java#id0 and #id1 fail
  • ... and 21 more: https://git.openjdk.org/jdk/compare/23eb648cae1ccadbca0fd654d4fbc28a1b8375e2...master

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 2, 2025
@openjdk
Copy link

openjdk bot commented Apr 2, 2025

@magicus The following label will be automatically applied to this pull request:

  • build

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.

@openjdk openjdk bot added the build build-dev@openjdk.org label Apr 2, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 2, 2025

Webrevs

@magicus magicus changed the title 8349075: Once again allow -compilejdk in JAVAOPTIONS 8349075: Once again allow -compilejdk in JAVA_OPTIONS Apr 2, 2025
Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks ! Looks good!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 2, 2025
@magicus
Copy link
Member Author

magicus commented Apr 4, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Apr 4, 2025

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 4, 2025
@openjdk openjdk bot closed this Apr 4, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 4, 2025
@openjdk
Copy link

openjdk bot commented Apr 4, 2025

@magicus Pushed as commit 3cc43b3.

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

@magicus magicus deleted the fix-jdk-for-compile branch April 4, 2025 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build build-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants