Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

8281638: jfr/event/allocation tests fail with release VMs after JDK-8281318 due to lack of -XX:+UnlockDiagnosticVMOptions #43

Closed
wants to merge 3 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Mar 11, 2022

Follow-up for JDK-8281318 backport.

Additional testing:

  • Linux x86_32 fastdebug, affected tests pass
  • Linux x86_32 release, affected tests pass

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8281638: jfr/event/allocation tests fail with release VMs after JDK-8281318 due to lack of -XX:+UnlockDiagnosticVMOptions

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk18u pull/43/head:pull/43
$ git checkout pull/43

Update a local copy of the PR:
$ git checkout pull/43
$ git pull https://git.openjdk.java.net/jdk18u pull/43/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 43

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk18u/pull/43.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 11, 2022

👋 Welcome back shade! A progress list of the required criteria for merging this PR into pr/42 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 changed the title Backport d254cf28c5e72bd9b8de863b831015237640ca25 8281638: jfr/event/allocation tests fail with release VMs after JDK-8281318 due to lack of -XX:+UnlockDiagnosticVMOptions Mar 11, 2022
@openjdk
Copy link

openjdk bot commented Mar 11, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Mar 11, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 11, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/42 to master April 6, 2022 08:14
@openjdk-notifier
Copy link

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8281318-jfr-32bit
git fetch https://git.openjdk.java.net/jdk18u master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Apr 6, 2022
@shipilev
Copy link
Member Author

shipilev commented Apr 6, 2022

Got the push approval.

/integrate

@openjdk openjdk bot added the clean label Apr 6, 2022
@openjdk
Copy link

openjdk bot commented Apr 6, 2022

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

8281638: jfr/event/allocation tests fail with release VMs after JDK-8281318 due to lack of -XX:+UnlockDiagnosticVMOptions

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Apr 6, 2022
@openjdk
Copy link

openjdk bot commented Apr 6, 2022

Going to push as commit ece6baa.

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

openjdk bot commented Apr 6, 2022

@shipilev Pushed as commit ece6baa.

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

@shipilev shipilev deleted the JDK-8281638-jfr-test-fixes branch April 6, 2022 08:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport clean integrated Pull request has been integrated
1 participant