Skip to content

8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options #14383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

mlchung
Copy link
Member

@mlchung mlchung commented Jun 8, 2023

The RuntimeArguments test verifies the VM arguments returned by jdk.internal.misc.VM::getRuntimeArguments as expected. This test fails when running with GraalVM as it was created with jlink --add-options and the application will always be launched with that additional set of VM options. This PR updates the test to read if 'jdk/internal/vm/options` is present and includle those options in the expected list.


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-8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14383

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 8, 2023

👋 Welcome back mchung! 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 openjdk bot added the rfr Pull request is ready for review label Jun 8, 2023
@openjdk
Copy link

openjdk bot commented Jun 8, 2023

@mlchung 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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jun 8, 2023
@dougxc
Copy link
Member

dougxc commented Jun 8, 2023

I can confirm the change works on GraalVM but it would make sense to also test it directly in the JDK by creating a test JDK image with jlink that includes VM options.

@mlbridge
Copy link

mlbridge bot commented Jun 8, 2023

Webrevs

@mlchung
Copy link
Member Author

mlchung commented Jun 8, 2023

I can confirm the change works on GraalVM but it would make sense to also test it directly in the JDK by creating a test JDK image with jlink that includes VM options.

Already exists. test/jdk/tools/jlink/plugins/AddOptionsPluginTest.java

@openjdk
Copy link

openjdk bot commented Jun 9, 2023

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

8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options

Reviewed-by: dnsimon, alanb

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

  • dc842e8: 8309665: Simplify Arrays.copyOf/-Range methods
  • 3070856: 8309702: Exclude java/lang/ScopedValue/StressStackOverflow.java from JTREG_TEST_THREAD_FACTORY=Virtual runs
  • 97df6cf: 8309545: Thread.interrupted from virtual thread needlessly resets interrupt status
  • f91e9ba: 8309612: [REDO] JDK-8307153 JVMTI GetThreadState on carrier should return STATE_WAITING
  • 0a697e7: 8307620: [IR Framework] Readme mentions JTREG_WHITE_LIST_FLAGS instead of JTREG_WHITELIST_FLAGS
  • 6f492e8: 8309686: inconsistent URL for https://www.unicode.org/reports/tr35
  • c4e6542: 8309675: Generational ZGC: compiler/gcbarriers/UnsafeIntrinsicsTest.java fails in nmt_commit
  • 34f0a6e: 8305593: Add @SPEC tags in java.desktop

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.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 9, 2023
@mlchung
Copy link
Member Author

mlchung commented Jun 9, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 9, 2023

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

  • 6cd370e: 8305645: System Tray icons get corrupted when Windows primary monitor changes
  • a48bcf3: 8308336: Test java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java failed: java.net.BindException: Address already in use
  • c052756: 8282797: CompileCommand parsing errors should exit VM
  • dc842e8: 8309665: Simplify Arrays.copyOf/-Range methods
  • 3070856: 8309702: Exclude java/lang/ScopedValue/StressStackOverflow.java from JTREG_TEST_THREAD_FACTORY=Virtual runs
  • 97df6cf: 8309545: Thread.interrupted from virtual thread needlessly resets interrupt status
  • f91e9ba: 8309612: [REDO] JDK-8307153 JVMTI GetThreadState on carrier should return STATE_WAITING
  • 0a697e7: 8307620: [IR Framework] Readme mentions JTREG_WHITE_LIST_FLAGS instead of JTREG_WHITELIST_FLAGS
  • 6f492e8: 8309686: inconsistent URL for https://www.unicode.org/reports/tr35
  • c4e6542: 8309675: Generational ZGC: compiler/gcbarriers/UnsafeIntrinsicsTest.java fails in nmt_commit
  • ... and 1 more: https://git.openjdk.org/jdk/compare/0be39054a631f282acc7ea05b2d98878a2b250bf...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 9, 2023

@mlchung Pushed as commit 679a6d8.

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

@mlchung mlchung deleted the JDK-8309303 branch August 2, 2023 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants